From b3c7bd8227dcb77222bd596c0cff474919bd5b99 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 3 Sep 2016 19:08:09 -0700 Subject: [PATCH] Qt: Fix lifetime issues with filename loading --- src/platform/qt/GameController.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/platform/qt/GameController.cpp b/src/platform/qt/GameController.cpp index 97e90d063..cd0e85d4d 100644 --- a/src/platform/qt/GameController.cpp +++ b/src/platform/qt/GameController.cpp @@ -368,20 +368,20 @@ void GameController::openGame(bool biosOnly) { m_drawContext = new uint32_t[width * height]; m_frontBuffer = new uint32_t[width * height]; - const char* base; + QByteArray bytes; if (!biosOnly) { - base = m_fname.toUtf8().constData(); + bytes = m_fname.toUtf8(); if (m_vf) { m_threadContext.core->loadROM(m_threadContext.core, m_vf); } else { - mCoreLoadFile(m_threadContext.core, base); + mCoreLoadFile(m_threadContext.core, bytes.constData()); mDirectorySetDetachBase(&m_threadContext.core->dirs); } } else { - base = m_bios.toUtf8().constData(); + bytes = m_bios.toUtf8(); } 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)); m_threadContext.core->setVideoBuffer(m_threadContext.core, m_drawContext, width);