From 134ac6a160d7187040b5211f1b84a5f3ba846f2b Mon Sep 17 00:00:00 2001 From: "sudonim1@gmail.com" Date: Tue, 24 Jul 2012 03:48:38 +0000 Subject: [PATCH] GUI: Closing the GS window didn't update the structure telling plugins about the window. Decided that just hiding the window has less race potential. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5347 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/gui/AppMain.cpp | 1 - pcsx2/gui/FrameForGS.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pcsx2/gui/AppMain.cpp b/pcsx2/gui/AppMain.cpp index 29886355df..3fe434d438 100644 --- a/pcsx2/gui/AppMain.cpp +++ b/pcsx2/gui/AppMain.cpp @@ -912,7 +912,6 @@ void Pcsx2App::OnGsFrameClosed( wxWindowID id ) if( (m_id_GsFrame == wxID_ANY) || (m_id_GsFrame != id) ) return; CoreThread.Suspend(); - m_id_GsFrame = wxID_ANY; if( !m_UseGUI ) { diff --git a/pcsx2/gui/FrameForGS.cpp b/pcsx2/gui/FrameForGS.cpp index 70ab14abe4..6d74ef8ce1 100644 --- a/pcsx2/gui/FrameForGS.cpp +++ b/pcsx2/gui/FrameForGS.cpp @@ -410,7 +410,7 @@ GSFrame::~GSFrame() throw() void GSFrame::OnCloseWindow(wxCloseEvent& evt) { sApp.OnGsFrameClosed( GetId() ); - evt.Skip(); // and close it. + Hide(); // and don't close it. } bool GSFrame::ShowFullScreen(bool show, long style)