summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Blok <jules.blok@gmail.com>2014-08-03 23:38:20 +0200
committerJules Blok <jules.blok@gmail.com>2014-08-03 23:38:20 +0200
commitb67ec4ea58ddf3af9fe1b6dd06a3e2c8e3a012c8 (patch)
tree092d057070e8c64f03f048a7bff74d9b47187281
parent857c116210e47ac921bfab60eb6abec5738afd15 (diff)
CFrame: Always exit fullscreen before showing the stop dialog.
-rw-r--r--Source/Core/DolphinWX/FrameTools.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
index 8ef5fd19f4..4c6d2a5fa3 100644
--- a/Source/Core/DolphinWX/FrameTools.cpp
+++ b/Source/Core/DolphinWX/FrameTools.cpp
@@ -1099,6 +1099,9 @@ void CFrame::DoStop()
// Ask for confirmation in case the user accidentally clicked Stop / Escape
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bConfirmStop)
{
+ // Exit fullscreen to ensure it does not cover the stop dialog.
+ DoFullscreen(false);
+
// Pause the state during confirmation and restore it afterwards
Core::EState state = Core::GetState();
@@ -1109,10 +1112,6 @@ void CFrame::DoStop()
{
Core::SetState(Core::CORE_PAUSE);
}
- else
- {
- DoFullscreen(false);
- }
wxMessageDialog m_StopDlg(
this,