Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Block GUI after stopping emulation

Browse Source 
This is necessary to prevent restarting the emulation until it's finished
Remove "process_events" callback completely
This commit is contained in:
Nekotekina
2018-06-02 00:46:13 +03:00
parent 1e107487da
commit 7242387a42
3 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/System.cpp
-4
View File
@@ -471,8 +471,6 @@ bool Emulator::InstallPkg(const std::string& path)
int_progress = static_cast<int>(pval); int_progress = static_cast<int>(pval);
LOG_SUCCESS(GENERAL, "... %u%%", int_progress); LOG_SUCCESS(GENERAL, "... %u%%", int_progress);
} }
m_cb.process_events();
} }
} }
@@ -1276,8 +1274,6 @@ void Emulator::Stop(bool restart)
while (g_thread_count) while (g_thread_count)
{ {
m_cb.process_events();
std::this_thread::sleep_for(10ms); std::this_thread::sleep_for(10ms);
} }
rpcs3/Emu/System.h
-1
View File
@@ -161,7 +161,6 @@ enum CellSysutilLang : s32;
struct EmuCallbacks struct EmuCallbacks
{ {
std::function<void(std::function<void()>)> call_after; std::function<void(std::function<void()>)> call_after;
std::function<void()> process_events;
std::function<void()> on_run; std::function<void()> on_run;
std::function<void()> on_pause; std::function<void()> on_pause;
std::function<void()> on_resume; std::function<void()> on_resume;
rpcs3/rpcs3_app.cpp
-6
View File
@@ -130,12 +130,6 @@ void rpcs3_app::InitializeCallbacks()
RequestCallAfter(std::move(func)); RequestCallAfter(std::move(func));
}; };
callbacks.process_events = [this]()
{
RPCS3MainWin->update();
processEvents();
};
callbacks.get_kb_handler = [=]() -> std::shared_ptr<KeyboardHandlerBase> callbacks.get_kb_handler = [=]() -> std::shared_ptr<KeyboardHandlerBase>
{ {
switch (keyboard_handler type = g_cfg.io.keyboard) switch (keyboard_handler type = g_cfg.io.keyboard)