summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorJules Blok <jules.blok@gmail.com>2014-07-25 15:33:50 +0200
committerJules Blok <jules.blok@gmail.com>2014-07-26 12:45:19 +0200
commiteea7086b23f45e4566550e99e3bd1fec7ecd4e2c (patch)
tree65263e4da4d75abb2dd7e05dc994ebf0cc308196 /Source/Core
parentbd9953d97ef45e165d0fb555efa29957c3bb8e82 (diff)
CFrame: Prevent fullscreen switches if the renderer is halted.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinWX/Frame.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index dc0eeeb8e6..1d7fb03819 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -1185,6 +1185,17 @@ void CFrame::OnMouse(wxMouseEvent& event)
void CFrame::DoFullscreen(bool bF)
{
+ if (g_Config.ExclusiveFullscreenEnabled() &&
+ !SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain &&
+ Core::GetState() != Core::CORE_RUN)
+ {
+ // A responsive renderer is required for exclusive fullscreen,
+ // but the renderer can only respond in the running state.
+ // Therefore we ignore fullscreen switches if we support
+ // exclusive fullscreen, but the renderer is not running.
+ return;
+ }
+
ToggleDisplayMode(bF);
#if defined(__APPLE__)