libretro/pcsx2
1
0
Fork 0
mirror of https://github.com/libretro/pcsx2.git synced 2025-02-14 22:49:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gs: fix freeze on close all windows

Browse Source
This commit is contained in:
Gauvain 'GovanifY' Roussel-Tarbouriech 2021-06-20 14:12:42 +02:00 committed by Kojin
parent 7597ac12b6
commit 483f28044b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcsx2/gui/MainFrame.cpp
View File

@ -36,6 +36,8 @@
#include "Recording/InputRecordingControls.h" #include "Recording/InputRecordingControls.h"
#endif #endif
extern std::atomic_bool init_gspanel;
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
wxMenu* MainEmuFrame::MakeStatesSubMenu(int baseid, int loadBackupId) const wxMenu* MainEmuFrame::MakeStatesSubMenu(int baseid, int loadBackupId) const
{ {
@ -154,6 +156,10 @@ bool MainEmuFrame::Destroy()
// //
void MainEmuFrame::OnCloseWindow(wxCloseEvent& evt) void MainEmuFrame::OnCloseWindow(wxCloseEvent& evt)
{ {
// the main thread is busy suspending everything, so let's not try to call it
// when closing the emulator
init_gspanel = false;
if (IsBeingDeleted()) if (IsBeingDeleted())
return; return;