Qt: Fix a race condition in PainterGL that could lead to a crash
Jeffrey Pfau jeffrey@endrift.com
Tue, 27 Oct 2015 20:27:02 -0700
2 files changed,
2 insertions(+),
1 deletions(-)
M
CHANGES
→
CHANGES
@@ -9,6 +9,7 @@ - Util: Fix PowerPC PNG read/write pixel order
- Qt: Use safer isLoaded check in GameController - GBA Memory: Fix DMAs from BIOS while not in BIOS - GBA: Fix idle skip state being retained between games + - Qt: Fix a race condition in PainterGL that could lead to a crash Misc: - Qt: Window size command line options are now supported - Qt: Increase usability of key mapper
M
src/platform/qt/DisplayGL.cpp
→
src/platform/qt/DisplayGL.cpp
@@ -205,7 +205,7 @@ m_active = true;
} void PainterGL::draw() { - if (m_queue.isEmpty()) { + if (m_queue.isEmpty() || !GBAThreadIsActive(m_context)) { return; } if (GBASyncWaitFrameStart(&m_context->sync) || !m_queue.isEmpty()) {