all repos — mgba @ 9a19aaed5933859fb8b0ed8910a93ab96e117f51

mGBA Game Boy Advance Emulator

–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
commit

9a19aaed5933859fb8b0ed8910a93ab96e117f51

parent

8af2172782b283a07ac40fcc36186c2f52bb1f7b

2 files changed, 2 insertions(+), 1 deletions(-)

jump to
M CHANGESCHANGES

@@ -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.cppsrc/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()) {