Qt: Clean up some path canonicalization

This commit is contained in:
Jeffrey Pfau 2016-05-22 22:48:12 -07:00
parent 2bfd721ea7
commit 03984ce085
3 changed files with 14 additions and 8 deletions

View File

@ -30,6 +30,7 @@ Misc:
- All: Allow use of external minizip library
- GBA Video: Null renderer should return proper register values
- Libretro: Disable logging game errors, BIOS calls and stubs in release builds
- Qt: Canonicalize file paths when loading games
0.4.0: (2016-02-02)
Features:

View File

@ -13,6 +13,7 @@
#include <QCoreApplication>
#include <QDateTime>
#include <QFileInfo>
#include <QThread>
#include <ctime>
@ -282,14 +283,12 @@ void GameController::setDebugger(ARMDebugger* debugger) {
void GameController::loadGame(const QString& path) {
closeGame();
QFile file(path);
if (!file.open(QIODevice::ReadOnly)) {
QFileInfo info(path);
if (!info.isReadable()) {
postLog(GBA_LOG_ERROR, tr("Failed to open game file: %1").arg(path));
return;
}
file.close();
m_fname = path;
m_fname = info.canonicalFilePath();
openGame();
}
@ -370,7 +369,12 @@ void GameController::replaceGame(const QString& path) {
return;
}
m_fname = path;
QFileInfo info(path);
if (!info.isReadable()) {
postLog(GBA_LOG_ERROR, tr("Failed to open game file: %1").arg(path));
return;
}
m_fname = info.canonicalFilePath();
threadInterrupt();
m_threadContext.fname = strdup(m_fname.toLocal8Bit().constData());
GBAThreadReplaceROM(&m_threadContext, m_threadContext.fname);

View File

@ -323,11 +323,12 @@ void Window::multiplayerChanged() {
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());
}
}