summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
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__)