emu_thread: properly force shutdown for unresponsive guest programs
This commit is contained in:
parent
f44c60321e
commit
179adee396
2 changed files with 5 additions and 12 deletions
|
@ -1792,12 +1792,14 @@ void GMainWindow::ShutdownGame() {
|
|||
discord_rpc->Pause();
|
||||
|
||||
RequestGameExit();
|
||||
emu_thread->RequestStop();
|
||||
|
||||
emit EmulationStopping();
|
||||
|
||||
// Wait for emulation thread to complete and delete it
|
||||
emu_thread->wait();
|
||||
if (!emu_thread->wait(5000)) {
|
||||
emu_thread->ForceStop();
|
||||
emu_thread->wait();
|
||||
}
|
||||
emu_thread = nullptr;
|
||||
|
||||
emulation_running = false;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue