diff options
| author | Jeremy Rimpo <jeremy.rimpo@servermonkey.com> | 2017-12-13 15:58:43 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-13 15:58:43 -0600 |
| commit | 554b46847589fffb6cd7bc5c54689665c34ed95b (patch) | |
| tree | 235f1cad320f73e6b22cdf330d9a14d42bd33092 /src/main.cpp | |
| parent | e4b952278d978567af3210d6a4be992eef3ba205 (diff) | |
| parent | 604d86ed07711651bc71871f6d37a794d916da6a (diff) | |
Merge pull request #148 from erasmux/lockeddialog_fixes
Lockeddialog fixes
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index b4faf570..90c15ccd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -578,8 +578,8 @@ int main(int argc, char *argv[]) try {
dataPath = InstanceManager::instance().determineDataPath();
} catch (const std::exception &e) {
- QMessageBox::critical(nullptr, QObject::tr("Failed to set up instance"),
- e.what());
+ if (strcmp(e.what(),"Canceled"))
+ QMessageBox::critical(nullptr, QObject::tr("Failed to set up instance"), e.what());
return 1;
}
application.setProperty("dataPath", dataPath);
|