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

Fix locking up when triggering turbo with no game loaded

This commit is contained in:
Jeffrey Pfau 2014-10-24 21:45:37 -07:00
parent 02116415d1
commit dcbfba03c3
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/platform/qt/GameController.cpp
View File

@ -137,8 +137,13 @@ void GameController::openGame() {
m_pauseAfterFrame = false; m_pauseAfterFrame = false;
m_threadContext.sync.videoFrameWait = m_videoSync; if (m_turbo) {
m_threadContext.sync.audioWait = m_audioSync; m_threadContext.sync.videoFrameWait = false;
m_threadContext.sync.audioWait = false;
} else {
m_threadContext.sync.videoFrameWait = m_videoSync;
m_threadContext.sync.audioWait = m_audioSync;
}
m_threadContext.fname = strdup(m_fname.toLocal8Bit().constData()); m_threadContext.fname = strdup(m_fname.toLocal8Bit().constData());
if (m_dirmode) { if (m_dirmode) {
@ -268,7 +273,7 @@ void GameController::saveState(int slot) {
void GameController::setVideoSync(bool set) { void GameController::setVideoSync(bool set) {
m_videoSync = set; m_videoSync = set;
if (!m_turbo) { if (!m_turbo && m_gameOpen) {
GBAThreadInterrupt(&m_threadContext); GBAThreadInterrupt(&m_threadContext);
m_threadContext.sync.videoFrameWait = set; m_threadContext.sync.videoFrameWait = set;
GBAThreadContinue(&m_threadContext); GBAThreadContinue(&m_threadContext);
@ -277,7 +282,7 @@ void GameController::setVideoSync(bool set) {
void GameController::setAudioSync(bool set) { void GameController::setAudioSync(bool set) {
m_audioSync = set; m_audioSync = set;
if (!m_turbo) { if (!m_turbo && m_gameOpen) {
GBAThreadInterrupt(&m_threadContext); GBAThreadInterrupt(&m_threadContext);
m_threadContext.sync.audioWait = set; m_threadContext.sync.audioWait = set;
GBAThreadContinue(&m_threadContext); GBAThreadContinue(&m_threadContext);
@ -294,10 +299,12 @@ void GameController::setTurbo(bool set, bool forced) {
} else { } else {
m_turboForced = false; m_turboForced = false;
} }
GBAThreadInterrupt(&m_threadContext); if (m_gameOpen) {
m_threadContext.sync.audioWait = set ? false : m_audioSync; GBAThreadInterrupt(&m_threadContext);
m_threadContext.sync.videoFrameWait = set ? false : m_videoSync; m_threadContext.sync.audioWait = set ? false : m_audioSync;
GBAThreadContinue(&m_threadContext); m_threadContext.sync.videoFrameWait = set ? false : m_videoSync;
GBAThreadContinue(&m_threadContext);
}
} }
void GameController::updateKeys() { void GameController::updateKeys() {