ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix extraneous dialog (fixes #1654)

This commit is contained in:
Vicki Pfau 2020-01-29 21:14:19 -08:00
parent 4036136fe5
commit 74af414b96
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -21,6 +21,7 @@ Other fixes:
- Qt: Fix missing OSD messages - Qt: Fix missing OSD messages
- Qt: Fix crash unloading shaders - Qt: Fix crash unloading shaders
- Qt: Fix toggled actions on gamepads (fixes mgba.io/i/1650) - 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) 0.8.0: (2020-01-21)
Features: Features:

1
src/platform/qt/CoreManager.cpp
View File

@ -83,6 +83,7 @@ CoreController* CoreManager::loadGame(VFile* vf, const QString& path, const QStr
mCore* core = mCoreFindVF(vf); mCore* core = mCoreFindVF(vf);
if (!core) { if (!core) {
LOG(QT, ERROR) << tr("Could not load game. Are you sure it's in the correct format?");
return nullptr; return nullptr;
} }

5
src/platform/qt/Window.cpp
View File

@ -860,8 +860,8 @@ void Window::gameCrashed(const QString& errorMessage) {
} }
void Window::gameFailed() { void Window::gameFailed() {
QMessageBox* fail = new QMessageBox(QMessageBox::Warning, tr("Couldn't Load"), QMessageBox* fail = new QMessageBox(QMessageBox::Warning, tr("Couldn't Start"),
tr("Could not load game. Are you sure it's in the correct format?"), tr("Could not start game."),
QMessageBox::Ok, this, Qt::Sheet); QMessageBox::Ok, this, Qt::Sheet);
fail->setAttribute(Qt::WA_DeleteOnClose); fail->setAttribute(Qt::WA_DeleteOnClose);
fail->show(); fail->show();
@ -1788,7 +1788,6 @@ void Window::updateFrame() {
void Window::setController(CoreController* controller, const QString& fname) { void Window::setController(CoreController* controller, const QString& fname) {
if (!controller) { if (!controller) {
gameFailed();
return; return;
} }
if (m_pendingClose) { if (m_pendingClose) {