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

Qt: Fix directory sets in BIOS-only boot

This commit is contained in:
Jeffrey Pfau 2016-08-10 22:43:25 -07:00
parent 051198395d
commit f73bc93080
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -341,6 +341,10 @@ void GameController::openGame(bool biosOnly) {
if (!biosOnly) { if (!biosOnly) {
mCoreLoadFile(m_threadContext.core, m_fname.toUtf8().constData()); mCoreLoadFile(m_threadContext.core, m_fname.toUtf8().constData());
} else {
char dirname[PATH_MAX];
separatePath(m_bios.toUtf8().constData(), dirname, m_threadContext.core->dirs.baseName, 0);
mDirectorySetAttachBase(&m_threadContext.core->dirs, VDirOpen(dirname));
} }
m_threadContext.core->setVideoBuffer(m_threadContext.core, m_drawContext, width); m_threadContext.core->setVideoBuffer(m_threadContext.core, m_drawContext, width);
@ -353,16 +357,6 @@ void GameController::openGame(bool biosOnly) {
} }
} }
if (!m_patch.isNull()) {
VFile* patch = VFileDevice::open(m_patch, O_RDONLY);
if (patch) {
m_threadContext.core->loadPatch(m_threadContext.core, patch);
}
patch->close(patch);
} else {
mCoreAutoloadPatch(m_threadContext.core);
}
m_inputController->recalibrateAxes(); m_inputController->recalibrateAxes();
memset(m_drawContext, 0xF8, width * height * 4); memset(m_drawContext, 0xF8, width * height * 4);
@ -374,6 +368,15 @@ void GameController::openGame(bool biosOnly) {
if (!biosOnly) { if (!biosOnly) {
mCoreAutoloadSave(m_threadContext.core); mCoreAutoloadSave(m_threadContext.core);
if (!m_patch.isNull()) {
VFile* patch = VFileDevice::open(m_patch, O_RDONLY);
if (patch) {
m_threadContext.core->loadPatch(m_threadContext.core, patch);
}
patch->close(patch);
} else {
mCoreAutoloadPatch(m_threadContext.core);
}
} }
if (!mCoreThreadStart(&m_threadContext)) { if (!mCoreThreadStart(&m_threadContext)) {