From d74092b29132ddf64bf0a59aa36a12927ca6c1d4 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 15 Sep 2016 09:50:06 -0700 Subject: [PATCH] Qt: Fix loading ROMs from an archive --- src/platform/qt/GameController.h | 2 +- src/platform/qt/Window.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/platform/qt/GameController.h b/src/platform/qt/GameController.h index 86f1e5c5a..ed384acfa 100644 --- a/src/platform/qt/GameController.h +++ b/src/platform/qt/GameController.h @@ -104,7 +104,7 @@ signals: public slots: void loadGame(const QString& path); - void loadGame(VFile* vf, const QString& base = QString()); + void loadGame(VFile* vf, const QString& base); void loadBIOS(const QString& path); void loadSave(const QString& path, bool temporary = true); void yankPak(); diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index 28b0be671..5c89629ae 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -351,10 +351,10 @@ void Window::selectROMInArchive() { return; } ArchiveInspector* archiveInspector = new ArchiveInspector(filename); - connect(archiveInspector, &QDialog::accepted, [this, archiveInspector]() { + connect(archiveInspector, &QDialog::accepted, [this, archiveInspector, filename]() { VFile* output = archiveInspector->selectedVFile(); if (output) { - m_controller->loadGame(output); + m_controller->loadGame(output, filename); } archiveInspector->close(); });