diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index a2a32c6ac8..290b1a8e10 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1180,12 +1180,12 @@ void CFrame::DoFullscreen(bool enable_fullscreen) void CFrame::DoExclusiveFullscreen(bool enable_fullscreen) { - if (g_renderer && g_renderer->IsFullscreen() != enable_fullscreen) - { - bool was_unpaused = Core::PauseAndLock(true); - g_renderer->SetFullscreen(enable_fullscreen); - Core::PauseAndLock(false, was_unpaused); - } + if (!g_renderer || g_renderer->IsFullscreen() == enable_fullscreen) + return; + + bool was_unpaused = Core::PauseAndLock(true); + g_renderer->SetFullscreen(enable_fullscreen); + Core::PauseAndLock(false, was_unpaused); } const CGameListCtrl* CFrame::GetGameListCtrl() const diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h index dfe0a637e6..dc31fed7cd 100644 --- a/Source/Core/DolphinWX/Frame.h +++ b/Source/Core/DolphinWX/Frame.h @@ -105,8 +105,8 @@ public: void OnRenderParentMove(wxMoveEvent& event); bool RendererHasFocus(); bool RendererIsFullscreen(); - void DoFullscreen(bool bF); - void DoExclusiveFullscreen(bool bF); + void DoFullscreen(bool enable_fullscreen); + void DoExclusiveFullscreen(bool enable_fullscreen); void ToggleDisplayMode(bool bFullscreen); static void ConnectWiimote(int wm_idx, bool connect); void UpdateTitle(const std::string& str); diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp index 0653f48afa..7845c84662 100644 --- a/Source/Core/VideoBackends/D3D/Render.cpp +++ b/Source/Core/VideoBackends/D3D/Render.cpp @@ -1255,7 +1255,7 @@ void Renderer::SetFullscreen(bool enable_fullscreen) D3D::SetFullscreenState(enable_fullscreen); } -bool Renderer::IsFullscreen() +bool Renderer::IsFullscreen() const { return D3D::GetFullscreenState(); } diff --git a/Source/Core/VideoBackends/D3D/Render.h b/Source/Core/VideoBackends/D3D/Render.h index bb16316aef..0507b76c80 100644 --- a/Source/Core/VideoBackends/D3D/Render.h +++ b/Source/Core/VideoBackends/D3D/Render.h @@ -26,7 +26,7 @@ public: void SetInterlacingMode() override; void SetViewport() override; void SetFullscreen(bool enable_fullscreen) override; - bool IsFullscreen() override; + bool IsFullscreen() const override; // TODO: Fix confusing names (see ResetAPIState and RestoreAPIState) void ApplyState(bool bUseDstAlpha) override; diff --git a/Source/Core/VideoCommon/RenderBase.h b/Source/Core/VideoCommon/RenderBase.h index 15324f0ab5..3d37b716f9 100644 --- a/Source/Core/VideoCommon/RenderBase.h +++ b/Source/Core/VideoCommon/RenderBase.h @@ -73,7 +73,7 @@ public: virtual void SetInterlacingMode() {} virtual void SetViewport() {} virtual void SetFullscreen(bool enable_fullscreen) {} - virtual bool IsFullscreen() { return false; } + virtual bool IsFullscreen() const { return false; } virtual void ApplyState(bool bUseDstAlpha) {} virtual void RestoreState() {} virtual void ResetAPIState() {}