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

Qt: Fix lifetime issues with filename loading

This commit is contained in:
Jeffrey Pfau 2016-09-03 19:08:09 -07:00
parent f17e327626
commit b3c7bd8227
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -368,20 +368,20 @@ void GameController::openGame(bool biosOnly) {
m_drawContext = new uint32_t[width * height]; m_drawContext = new uint32_t[width * height];
m_frontBuffer = new uint32_t[width * height]; m_frontBuffer = new uint32_t[width * height];
const char* base; QByteArray bytes;
if (!biosOnly) { if (!biosOnly) {
base = m_fname.toUtf8().constData(); bytes = m_fname.toUtf8();
if (m_vf) { if (m_vf) {
m_threadContext.core->loadROM(m_threadContext.core, m_vf); m_threadContext.core->loadROM(m_threadContext.core, m_vf);
} else { } else {
mCoreLoadFile(m_threadContext.core, base); mCoreLoadFile(m_threadContext.core, bytes.constData());
mDirectorySetDetachBase(&m_threadContext.core->dirs); mDirectorySetDetachBase(&m_threadContext.core->dirs);
} }
} else { } else {
base = m_bios.toUtf8().constData(); bytes = m_bios.toUtf8();
} }
char dirname[PATH_MAX]; char dirname[PATH_MAX];
separatePath(base, dirname, m_threadContext.core->dirs.baseName, 0); separatePath(bytes.constData(), dirname, m_threadContext.core->dirs.baseName, 0);
mDirectorySetAttachBase(&m_threadContext.core->dirs, VDirOpen(dirname)); 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);