piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt/NetPlayDialog: Request game stop when core enters stopping state

Browse Source 
This makes it possible to gracefully force stop emulation rather than
having to kill Dolphin completely when NetPlay deadlocks in the input
loop. Without a graceful stop, Wii saves do not get flushed to the main
NAND, and are left in limbo in the temporary NAND.
This commit is contained in:
Techjar 2018-11-30 01:20:51 -05:00
parent baecc500e8
commit 9c51439144
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp
View File

@ -338,6 +338,11 @@ void NetPlayDialog::ConnectWidgets()
if (isVisible()) if (isVisible())
{ {
GameStatusChanged(state != Core::State::Uninitialized); GameStatusChanged(state != Core::State::Uninitialized);
if ((state == Core::State::Uninitialized || state == Core::State::Stopping) &&
!m_got_stop_request)
{
Settings::Instance().GetNetPlayClient()->RequestStopGame();
}
if (state == Core::State::Uninitialized) if (state == Core::State::Uninitialized)
DisplayMessage(tr("Stopped game"), "red"); DisplayMessage(tr("Stopped game"), "red");
} }
@ -808,9 +813,6 @@ void NetPlayDialog::OnMsgChangeGame(const std::string& title)
void NetPlayDialog::GameStatusChanged(bool running) void NetPlayDialog::GameStatusChanged(bool running)
{ {
if (!running && !m_got_stop_request)
Settings::Instance().GetNetPlayClient()->RequestStopGame();
QueueOnObject(this, [this, running] { SetOptionsEnabled(!running); }); QueueOnObject(this, [this, running] { SetOptionsEnabled(!running); });
} }