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

Qt: Fix infrequent deadlock when using sync to video

This commit is contained in:
Vicki Pfau 2021-04-23 20:44:49 -07:00
parent adac035422
commit 967cc0886e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -2,6 +2,8 @@
Features: Features:
- Tool for converting scanned pictures of e-Reader cards to raw dotcode data - Tool for converting scanned pictures of e-Reader cards to raw dotcode data
- Cheat code support in homebrew ports - Cheat code support in homebrew ports
Other fixes:
- Qt: Fix infrequent deadlock when using sync to video
Misc: Misc:
- Qt: Rearrange menus some - Qt: Rearrange menus some

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

@ -158,7 +158,6 @@ void DisplayGL::stopDrawing() {
void DisplayGL::pauseDrawing() { void DisplayGL::pauseDrawing() {
if (m_hasStarted) { if (m_hasStarted) {
m_isDrawing = false; m_isDrawing = false;
CoreController::Interrupter interrupter(m_context);
QMetaObject::invokeMethod(m_painter.get(), "pause", Qt::BlockingQueuedConnection); QMetaObject::invokeMethod(m_painter.get(), "pause", Qt::BlockingQueuedConnection);
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
setUpdatesEnabled(true); setUpdatesEnabled(true);
@ -169,7 +168,6 @@ void DisplayGL::pauseDrawing() {
void DisplayGL::unpauseDrawing() { void DisplayGL::unpauseDrawing() {
if (m_hasStarted) { if (m_hasStarted) {
m_isDrawing = true; m_isDrawing = true;
CoreController::Interrupter interrupter(m_context);
QMetaObject::invokeMethod(m_painter.get(), "unpause", Qt::BlockingQueuedConnection); QMetaObject::invokeMethod(m_painter.get(), "unpause", Qt::BlockingQueuedConnection);
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
setUpdatesEnabled(false); setUpdatesEnabled(false);