From 0c81494c895d7cc6741062e77b5efd11b8009eec Mon Sep 17 00:00:00 2001
From: Jules Blok <jules.blok@gmail.com>
Date: Mon, 21 Jul 2014 19:56:52 +0200
Subject: [PATCH] Frame: Make the fullscreen transitions more reliable.

---
 Source/Core/DolphinWX/Frame.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index d849324a9f..dc0eeeb8e6 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -450,7 +450,7 @@ bool CFrame::RendererIsFullscreen()
 
 	if (Core::GetState() == Core::CORE_RUN || Core::GetState() == Core::CORE_PAUSE)
 	{
-		fullscreen = m_RenderFrame->IsFullScreen();
+		fullscreen = m_RenderFrame->IsFullScreen() && g_Config.bFullscreen;
 	}
 
 #if defined(__APPLE__)
@@ -641,10 +641,14 @@ void CFrame::OnHostMessage(wxCommandEvent& event)
 		break;
 
 	case IDM_FULLSCREENREQUEST:
-		if (m_RenderFrame != nullptr)
-			m_RenderFrame->ShowFullScreen(event.GetInt() == 0 ? false : true);
-		if (m_confirmStop)
-			Core::SetState(Core::CORE_PAUSE);
+		{
+			bool fullscreen = event.GetInt() == 0 ? false : true;
+			ToggleDisplayMode(fullscreen);
+			if (m_RenderFrame != nullptr)
+				m_RenderFrame->ShowFullScreen(fullscreen);
+			if (m_confirmStop)
+				Core::SetState(Core::CORE_PAUSE);
+		}
 		break;
 
 	case WM_USER_CREATE: