all repos — mgba @ d74092b29132ddf64bf0a59aa36a12927ca6c1d4

mGBA Game Boy Advance Emulator

Qt: Fix loading ROMs from an archive
Jeffrey Pfau jeffrey@endrift.com
Thu, 15 Sep 2016 09:50:06 -0700
commit

d74092b29132ddf64bf0a59aa36a12927ca6c1d4

parent

d618bf8d7b74ff4d89d16c74d5696b9bf94c76fd

2 files changed, 3 insertions(+), 3 deletions(-)

jump to
M src/platform/qt/GameController.hsrc/platform/qt/GameController.h

@@ -104,7 +104,7 @@ void postLog(int level, int category, const QString& log);

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();
M src/platform/qt/Window.cppsrc/platform/qt/Window.cpp

@@ -351,10 +351,10 @@ if (filename.isEmpty()) {

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(); });