archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-12 17:58:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gsframe: Break waiting is emulator is stopped suddenly

Browse source 
- Keeps the queue from hanging the GUI
This commit is contained in:
kd-11 2017-10-28 19:05:46 +03:00
parent ce2b790d8f
commit 395b4bfa45
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/rpcs3qt/gs_frame.cpp
View file

@ -246,10 +246,10 @@ bool gs_frame::event(QEvent* ev)
bool gs_frame::nativeEvent(const QByteArray &eventType, void *message, long *result) bool gs_frame::nativeEvent(const QByteArray &eventType, void *message, long *result)
{ {
#ifdef _WIN32 #ifdef _WIN32
if (wm_event_queue_enabled.load(std::memory_order_consume)) if (wm_event_queue_enabled.load(std::memory_order_consume) && !Emu.IsStopped())
{ {
//Wait for consumer to clear notification pending flag //Wait for consumer to clear notification pending flag
while (wm_event_raised.load(std::memory_order_consume)); while (wm_event_raised.load(std::memory_order_consume) && !Emu.IsStopped());
{ {
std::lock_guard<std::mutex> lock(wm_event_lock); std::lock_guard<std::mutex> lock(wm_event_lock);
@ -337,7 +337,7 @@ bool gs_frame::nativeEvent(const QByteArray &eventType, void *message, long *res
} }
//Do not enter DefWndProc until the consumer has consumed the message //Do not enter DefWndProc until the consumer has consumed the message
while (wm_event_raised.load(std::memory_order_consume)); while (wm_event_raised.load(std::memory_order_consume) && !Emu.IsStopped());
} }
#endif #endif