diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2014-08-12 14:55:18 -0700 |
|---|---|---|
| committer | shuffle2 <godisgovernment@gmail.com> | 2014-08-12 14:55:18 -0700 |
| commit | 7b9c8da468b2a92aa8ec7677bf7766d7491eb214 (patch) | |
| tree | 07dc72bf8d9872fde917adb766cc7e86894dec19 /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | 6a336f66a89820f3f0c664c0b261b1d606ba28cb (diff) | |
| parent | b67ec4ea58ddf3af9fe1b6dd06a3e2c8e3a012c8 (diff) | |
Merge pull request #726 from Armada651/ogl-exclusive
CFrame: Add fullscreen window styles to enable exclusive mode in OpenGL.
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 766c1bd48d..1deb91a857 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -1072,6 +1072,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(); @@ -1082,10 +1085,6 @@ void CFrame::DoStop() { Core::SetState(Core::CORE_PAUSE); } - else - { - DoFullscreen(false); - } wxMessageDialog m_StopDlg( this, |