Permalink
Browse files

Merge pull request #6864 from spycrab/qt_fix_fs_crash

Qt/Host: Fix random crashes when exiting fullscreen
  • Loading branch information...
Helios747 committed May 15, 2018
2 parents 71f5faf + b9bd4ec commit 1d027c6049c642aa707ebc363cbacf83813ea8d4
Showing with 5 additions and 5 deletions.
  1. +5 −5 Source/Core/DolphinQt2/Host.cpp
@@ -46,7 +46,10 @@ void Host::SetRenderFocus(bool focus)
{
m_render_focus = focus;
if (g_renderer && m_render_fullscreen && g_ActiveConfig.ExclusiveFullscreenEnabled())
Core::RunAsCPUThread([focus] { g_renderer->SetFullscreen(focus); });
Core::RunAsCPUThread([focus] {
if (!SConfig::GetInstance().bRenderToMain)
g_renderer->SetFullscreen(focus);
});
}
bool Host::GetRenderFullscreen()
@@ -110,10 +113,7 @@ void Host_YieldToUI()
void Host_UpdateDisasmDialog()
{
RunOnObject(QApplication::instance(), [&] {
emit Host::GetInstance()->UpdateDisasmDialog();
return true;
});
QueueOnObject(Host::GetInstance(), [] { emit Host::GetInstance()->UpdateDisasmDialog(); });
}
void Host_UpdateProgressDialog(const char* caption, int position, int total)

0 comments on commit 1d027c6

Please sign in to comment.