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

Qt: Fix some rewind timer bugs

This commit is contained in:
Jeffrey Pfau 2015-05-31 13:21:06 -07:00
parent 041b58ebce
commit 67e13114ef
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,7 @@ GameController::GameController(QObject* parent)
, m_turbo(false)
, m_turboForced(false)
, m_turboSpeed(-1)
, m_wasPaused(false)
, m_inputController(nullptr)
, m_multiplayer(nullptr)
, m_stateSlot(1)
@ -351,6 +352,7 @@ void GameController::closeGame() {
if (!m_gameOpen) {
return;
}
m_rewindTimer.stop();
if (GBAThreadIsPaused(&m_threadContext)) {
GBAThreadUnpause(&m_threadContext);
}
@ -388,7 +390,7 @@ bool GameController::isPaused() {
}
void GameController::setPaused(bool paused) {
if (!m_gameOpen || paused == GBAThreadIsPaused(&m_threadContext)) {
if (!m_gameOpen || m_rewindTimer.isActive() || paused == GBAThreadIsPaused(&m_threadContext)) {
return;
}
if (paused) {
@ -452,13 +454,17 @@ void GameController::rewind(int states) {
}
void GameController::startRewinding() {
threadInterrupt();
if (!m_gameOpen) {
return;
}
m_wasPaused = isPaused();
setPaused(true);
m_rewindTimer.start();
}
void GameController::stopRewinding() {
m_rewindTimer.stop();
threadContinue();
setPaused(m_wasPaused);
}
void GameController::keyPressed(int key) {

1
src/platform/qt/GameController.h
View File

@ -187,6 +187,7 @@ private:
bool m_turboForced;
float m_turboSpeed;
QTimer m_rewindTimer;
bool m_wasPaused;
int m_stateSlot;