ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Frame: Make the fullscreen transitions more reliable.

This commit is contained in:
Jules Blok 2014-07-21 19:56:52 +02:00
parent 009b4dd376
commit 0c81494c89
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/DolphinWX/Frame.cpp
View File

@ -450,7 +450,7 @@ bool CFrame::RendererIsFullscreen()
if (Core::GetState() == Core::CORE_RUN || Core::GetState() == Core::CORE_PAUSE) 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__) #if defined(__APPLE__)
@ -641,10 +641,14 @@ void CFrame::OnHostMessage(wxCommandEvent& event)
break; break;
case IDM_FULLSCREENREQUEST: case IDM_FULLSCREENREQUEST:
if (m_RenderFrame != nullptr) {
m_RenderFrame->ShowFullScreen(event.GetInt() == 0 ? false : true); bool fullscreen = event.GetInt() == 0 ? false : true;
if (m_confirmStop) ToggleDisplayMode(fullscreen);
Core::SetState(Core::CORE_PAUSE); if (m_RenderFrame != nullptr)
m_RenderFrame->ShowFullScreen(fullscreen);
if (m_confirmStop)
Core::SetState(Core::CORE_PAUSE);
}
break; break;
case WM_USER_CREATE: case WM_USER_CREATE: