diff options
| author | Jules Blok <jules.blok@gmail.com> | 2014-06-28 18:56:53 +0200 |
|---|---|---|
| committer | Jules Blok <jules.blok@gmail.com> | 2014-07-08 21:21:25 +0200 |
| commit | ad1b61af2e5d5b4c63c6d7ed052775e1c2858c39 (patch) | |
| tree | 179b6a50464d97560bf53d182c48560c080f2f56 /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | 49eade69a3938b75c2ace7848161d30c845e940c (diff) | |
FrameTools: Update GUI and disable Play button when in stopping state.
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 6fb0f0106a..66a5aa6858 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -1127,6 +1127,7 @@ void CFrame::DoStop() wxBeginBusyCursor(); BootManager::Stop(); + UpdateGUI(); } } @@ -1638,6 +1639,7 @@ void CFrame::UpdateGUI() bool Initialized = Core::IsRunning(); bool Running = Core::GetState() == Core::CORE_RUN; bool Paused = Core::GetState() == Core::CORE_PAUSE; + bool Stopping = Core::GetState() == Core::CORE_STOPPING; bool RunningWii = Initialized && SConfig::GetInstance().m_LocalCoreStartupParameter.bWii; bool RunningGamecube = Initialized && !SConfig::GetInstance().m_LocalCoreStartupParameter.bWii; @@ -1784,8 +1786,8 @@ void CFrame::UpdateGUI() { // Game has been loaded, enable the pause button if (m_ToolBar) - m_ToolBar->EnableTool(IDM_PLAY, true); - GetMenuBar()->FindItem(IDM_PLAY)->Enable(true); + m_ToolBar->EnableTool(IDM_PLAY, !Stopping); + GetMenuBar()->FindItem(IDM_PLAY)->Enable(!Stopping); // Reset game loading flag m_bGameLoading = false; |