From cb6ba59a4434591d91c920ac5735b098ad41112f Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sat, 27 Oct 2018 21:18:54 +1000 Subject: [PATCH] Host: Don't call ChangeSurface when handle hasn't changed This was causing a deadlock when switching to fullscreen in render-to-main-window mode. --- Source/Core/DolphinQt/Host.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Core/DolphinQt/Host.cpp b/Source/Core/DolphinQt/Host.cpp index daaaee14b0..5e73896d7a 100644 --- a/Source/Core/DolphinQt/Host.cpp +++ b/Source/Core/DolphinQt/Host.cpp @@ -32,6 +32,10 @@ Host* Host::GetInstance() void Host::SetRenderHandle(void* handle) { + if (m_render_handle == handle) + return; + + m_render_handle = handle; if (g_renderer) g_renderer->ChangeSurface(handle); }