all repos — mgba @ 210ef6db506e26cd3bc2f0eb67d46563285fdfdb

mGBA Game Boy Advance Emulator

Qt: Clean up some path canonicalization
Jeffrey Pfau jeffrey@endrift.com
Sun, 22 May 2016 22:48:12 -0700
commit

210ef6db506e26cd3bc2f0eb67d46563285fdfdb

parent

0080fab314192b5b24beb338f2f83fbe9f3c1e82

3 files changed, 13 insertions(+), 8 deletions(-)

jump to
M CHANGESCHANGES

@@ -42,6 +42,7 @@ - GBA Video: Null renderer should return proper register values

- Libretro: Disable logging game errors, BIOS calls and stubs in release builds - ARM7: Support forcing Thumb mode via MSR - ARM7: Flush prefetch cache when loading CPSR via MSR + - Qt: Canonicalize file paths when loading games 0.4.0: (2016-02-02) Features:
M src/platform/qt/GameController.cppsrc/platform/qt/GameController.cpp

@@ -288,14 +288,12 @@ #endif

void GameController::loadGame(const QString& path) { closeGame(); - QFile file(path); - if (!file.open(QIODevice::ReadOnly)) { + QFileInfo info(path); + if (!info.isReadable()) { LOG(QT, ERROR) << tr("Failed to open game file: %1").arg(path); return; } - file.close(); - - m_fname = path; + m_fname = info.canonicalFilePath(); openGame(); }

@@ -406,7 +404,12 @@ if (!m_gameOpen) {

return; } - m_fname = path; + QFileInfo info(path); + if (!info.isReadable()) { + LOG(QT, ERROR) << tr("Failed to open game file: %1").arg(path); + return; + } + m_fname = info.canonicalFilePath(); threadInterrupt(); mCoreLoadFile(m_threadContext.core, m_fname.toLocal8Bit().constData()); threadContinue();
M src/platform/qt/Window.cppsrc/platform/qt/Window.cpp

@@ -333,11 +333,12 @@

void Window::selectBIOS() { QString filename = GBAApp::app()->getOpenFileName(this, tr("Select BIOS")); if (!filename.isEmpty()) { - m_config->setOption("bios", filename); + QFileInfo info(filename); + m_config->setOption("bios", info.canonicalFilePath()); m_config->updateOption("bios"); m_config->setOption("useBios", true); m_config->updateOption("useBios"); - m_controller->loadBIOS(filename); + m_controller->loadBIOS(info.canonicalFilePath()); } }