diff options
| author | Leo Lam <leolino.lam@gmail.com> | 2017-08-02 12:49:46 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-02 12:49:46 +0800 |
| commit | 7565d977333c0e5cc148f54fd1e97299335195be (patch) | |
| tree | 499ff1913483cfda2dc7b3fae79b83a93b5d5dd8 /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | d3bb964d79b3d54ea46da8ecf559692017595eb6 (diff) | |
| parent | 11cab1c68d38c2073feb7c263e46e3f263c6799d (diff) | |
Merge pull request #4980 from FunctionalDragon/patch-2
send stop message before saving recording
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index c98297a421..3905c75984 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -881,15 +881,15 @@ void CFrame::DoStop() Core::SetState(state); } + if (NetPlayDialog::GetNetPlayClient()) + NetPlayDialog::GetNetPlayClient()->Stop(); + // TODO: Show the author/description dialog here if (Movie::IsRecordingInput()) DoRecordingSave(); if (Movie::IsMovieActive()) Movie::EndPlayInput(false); - if (NetPlayDialog::GetNetPlayClient()) - NetPlayDialog::GetNetPlayClient()->Stop(); - if (!m_tried_graceful_shutdown && UICommon::TriggerSTMPowerEvent()) { m_tried_graceful_shutdown = true; |
