archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-16 11:48:36 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

rsx: Improve gs frame exit workaround

Browse source 
Move to close(), hide before potential hanging at Emu.Stop()
This commit is contained in:
Eladash 2021-01-22 10:29:57 +02:00 • committed by kd-11
parent 79513f06a4
commit b96864c7e6
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rpcs3/Emu/RSX/GSRender.cpp
View file

@ -20,7 +20,6 @@ GSRender::~GSRender()
if (m_frame) if (m_frame)
{ {
m_frame->hide();
m_frame->close(); m_frame->close();
} }
} }

13
rpcs3/rpcs3qt/gs_frame.cpp
View file

@ -286,12 +286,17 @@ bool gs_frame::get_mouse_lock_state()
void gs_frame::close() void gs_frame::close()
{ {
if (!Emu.IsStopped()) Emu.CallAfter([this]()
{ {
Emu.Stop(); QWindow::hide(); // Workaround
}
Emu.CallAfter([this]() { deleteLater(); }); if (!Emu.IsStopped())
{
Emu.Stop();
}
deleteLater();
});
} }
bool gs_frame::shown() bool gs_frame::shown()