ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

–Qt: Fix a race condition in PainterGL that could lead to a crash

This commit is contained in:
Jeffrey Pfau 2015-10-27 20:27:02 -07:00
parent 8bdd817238
commit 86b8b1ce3b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -2,6 +2,7 @@
Bugfixes: Bugfixes:
- Qt: Use safer isLoaded check in GameController - Qt: Use safer isLoaded check in GameController
- GBA: Fix idle skip state being retained between games - GBA: Fix idle skip state being retained between games
- Qt: Fix a race condition in PainterGL that could lead to a crash
Misc: Misc:
- GBA Audio: Implement missing flags on SOUNDCNT_X register - GBA Audio: Implement missing flags on SOUNDCNT_X register

2
src/platform/qt/DisplayGL.cpp
View File

@ -205,7 +205,7 @@ void PainterGL::start() {
} }
void PainterGL::draw() { void PainterGL::draw() {
if (m_queue.isEmpty()) { if (m_queue.isEmpty() || !GBAThreadIsActive(m_context)) {
return; return;
} }
if (GBASyncWaitFrameStart(&m_context->sync, m_context->frameskip) || !m_queue.isEmpty()) { if (GBASyncWaitFrameStart(&m_context->sync, m_context->frameskip) || !m_queue.isEmpty()) {