From 0de073edead76770aaa3b05638d3ebaa5d5f64f8 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 25 Dec 2012 21:12:51 -0600 Subject: [PATCH] When using the "Keep window on top option" make sure that the effect of that option ends when emulation ends when using render to main. --- Source/Core/DolphinWX/Src/FrameTools.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index fa326adecc..7b595c485e 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -1142,6 +1142,9 @@ void CFrame::DoStop() DoFullscreen(false); if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain) m_RenderFrame->Destroy(); + else + // Make sure the window is not longer set to stay on top + m_RenderFrame->SetWindowStyle(m_RenderFrame->GetWindowStyle() & ~wxSTAY_ON_TOP); m_RenderParent = NULL; // Clean framerate indications from the status bar.