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

Qt: Fix savestate problems in BIOS boot

This commit is contained in:
Jeffrey Pfau 2016-01-11 02:36:56 -08:00
parent 9c5852a896
commit 5dc56b98e8
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,7 +110,7 @@ GameController::GameController(QObject* parent)
context->gba->video.renderer->disableOBJ = !controller->m_videoLayers[4]; context->gba->video.renderer->disableOBJ = !controller->m_videoLayers[4];
controller->m_fpsTarget = context->fpsTarget; controller->m_fpsTarget = context->fpsTarget;
if (GBALoadState(context, context->dirs.state, 0, SAVESTATE_SCREENSHOT)) { if (context->dirs.state && GBALoadState(context, context->dirs.state, 0, SAVESTATE_SCREENSHOT)) {
VFile* vf = GBAGetState(context->gba, context->dirs.state, 0, true); VFile* vf = GBAGetState(context->gba, context->dirs.state, 0, true);
if (vf) { if (vf) {
vf->truncate(vf, 0); vf->truncate(vf, 0);
@ -696,6 +696,10 @@ void GameController::setUseBIOS(bool use) {
} }
void GameController::loadState(int slot) { void GameController::loadState(int slot) {
if (!m_threadContext.fname) {
// We're in the BIOS
return;
}
if (slot > 0 && slot != m_stateSlot) { if (slot > 0 && slot != m_stateSlot) {
m_stateSlot = slot; m_stateSlot = slot;
m_backupSaveState.clear(); m_backupSaveState.clear();
@ -714,6 +718,10 @@ void GameController::loadState(int slot) {
} }
void GameController::saveState(int slot) { void GameController::saveState(int slot) {
if (!m_threadContext.fname) {
// We're in the BIOS
return;
}
if (slot > 0) { if (slot > 0) {
m_stateSlot = slot; m_stateSlot = slot;
} }