all repos — mgba @ 74af414b966950fc872cbddc05b8083fe29fef95

mGBA Game Boy Advance Emulator

Qt: Fix extraneous dialog (fixes #1654)
Vicki Pfau vi@endrift.com
Wed, 29 Jan 2020 21:14:19 -0800
commit

74af414b966950fc872cbddc05b8083fe29fef95

parent

4036136fe54e1b66ded88869d2eade20fc3a3cd5

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

jump to
M CHANGESCHANGES

@@ -21,6 +21,7 @@ - Qt: Fix color selection in asset view (fixes mgba.io/i/1648)

- Qt: Fix missing OSD messages - Qt: Fix crash unloading shaders - Qt: Fix toggled actions on gamepads (fixes mgba.io/i/1650) + - Qt: Fix extraneous dialog (fixes mgba.io/i/1654) 0.8.0: (2020-01-21) Features:
M src/platform/qt/CoreManager.cppsrc/platform/qt/CoreManager.cpp

@@ -83,6 +83,7 @@ }

mCore* core = mCoreFindVF(vf); if (!core) { + LOG(QT, ERROR) << tr("Could not load game. Are you sure it's in the correct format?"); return nullptr; }
M src/platform/qt/Window.cppsrc/platform/qt/Window.cpp

@@ -860,8 +860,8 @@ crash->show();

} void Window::gameFailed() { - QMessageBox* fail = new QMessageBox(QMessageBox::Warning, tr("Couldn't Load"), - tr("Could not load game. Are you sure it's in the correct format?"), + QMessageBox* fail = new QMessageBox(QMessageBox::Warning, tr("Couldn't Start"), + tr("Could not start game."), QMessageBox::Ok, this, Qt::Sheet); fail->setAttribute(Qt::WA_DeleteOnClose); fail->show();

@@ -1788,7 +1788,6 @@ }

void Window::setController(CoreController* controller, const QString& fname) { if (!controller) { - gameFailed(); return; } if (m_pendingClose) {