From b67ec4ea58ddf3af9fe1b6dd06a3e2c8e3a012c8 Mon Sep 17 00:00:00 2001
From: Jules Blok <jules.blok@gmail.com>
Date: Sun, 3 Aug 2014 23:38:20 +0200
Subject: [PATCH] CFrame: Always exit fullscreen before showing the stop
dialog.
---
Source/Core/DolphinWX/FrameTools.cpp | 7 +++----
1 file 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,