From 009b4dd3764a983ba5e9476383ea07430cdff8cb Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Mon, 21 Jul 2014 17:55:21 +0200 Subject: Exit exclusive fullscreen when the stop confirmation is shown. Also have the renderer remember its own fullscreen state. This is done to prevent a case where we exit exclusive fullscreen through the configuration and a focus shift at the same time. In this case the renderer would fail to detect that the fullscreen state was changed. --- Source/Core/DolphinWX/Frame.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Source/Core/DolphinWX/Frame.cpp') diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 25a09d13e1..d849324a9f 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -316,7 +316,7 @@ CFrame::CFrame(wxFrame* parent, , m_LogWindow(nullptr), m_LogConfigWindow(nullptr) , m_FifoPlayerDlg(nullptr), UseDebugger(_UseDebugger) , m_bBatchMode(_BatchMode), m_bEdit(false), m_bTabSplit(false), m_bNoDocking(false) - , m_bGameLoading(false), m_bClosing(false) + , m_bGameLoading(false), m_bClosing(false), m_confirmStop(false) { for (int i = 0; i <= IDM_CODEWINDOW - IDM_LOGWINDOW; i++) bFloatWindow[i] = false; @@ -643,6 +643,8 @@ void CFrame::OnHostMessage(wxCommandEvent& event) case IDM_FULLSCREENREQUEST: if (m_RenderFrame != nullptr) m_RenderFrame->ShowFullScreen(event.GetInt() == 0 ? false : true); + if (m_confirmStop) + Core::SetState(Core::CORE_PAUSE); break; case WM_USER_CREATE: @@ -1194,9 +1196,8 @@ void CFrame::DoFullscreen(bool bF) { m_RenderFrame->ShowFullScreen(true, wxFULLSCREEN_ALL); } - else if (!g_ActiveConfig.backend_info.bSupportsExclusiveFullscreen || - SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain || - g_ActiveConfig.bForceBorderlessFullscreen) + else if (!g_Config.ExclusiveFullscreenEnabled() || + SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain) { // Exiting exclusive fullscreen should be done from a Renderer callback. // Therefore we don't exit fullscreen from here if we support exclusive mode. -- cgit v1.2.3