From eea7086b23f45e4566550e99e3bd1fec7ecd4e2c Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Fri, 25 Jul 2014 15:33:50 +0200 Subject: [PATCH] CFrame: Prevent fullscreen switches if the renderer is halted. --- Source/Core/DolphinWX/Frame.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) 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__)