diff options
| author | skidau <skidau@gmail.com> | 2014-10-11 14:27:49 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2014-10-11 14:27:49 +1100 |
| commit | a373cc065478b814412c3e9975a9602ee5b0dd59 (patch) | |
| tree | a77004fa76e106daaa9f9165fb5fd40ee3fcd504 /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | 98d9a38fe09b3f372e99a2a8204d1b0f733a56ce (diff) | |
| parent | 03e1bd0995c5e77d954067653716fd72b7579c95 (diff) | |
Merge pull request #1231 from Armada651/borderless
Support the borderless fullscreen option in all backends.
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 5159502d97..fe8c872fb4 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -1111,7 +1111,7 @@ void CFrame::DoStop() // If exclusive fullscreen is not enabled then we can pause the emulation // before we've exited fullscreen. If not then we need to exit fullscreen first. - if (!RendererIsFullscreen() || g_Config.BorderlessFullscreenEnabled() || + if (!RendererIsFullscreen() || !g_Config.ExclusiveFullscreenEnabled() || SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain) { Core::SetState(Core::CORE_PAUSE); |