Skip to content
Snippets Groups Projects
Commit b091a789 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

use QApplication instance; set return values

parent 6e3201d4
No related branches found
No related tags found
2 merge requests!1525Updates from r20.0,!1518Failed assertion throws runtime_error; message box moved to GUI main loop try..catch wrapper (#496)
...@@ -36,11 +36,11 @@ int main(int argc, char* argv[]) ...@@ -36,11 +36,11 @@ int main(int argc, char* argv[])
qRegisterMetaType<QVector<double>>("QVector<double>"); qRegisterMetaType<QVector<double>>("QVector<double>");
QApplication app(argc, argv); QApplication app(argc, argv);
QApplication::setApplicationName("BornAgain"); app.setApplicationName("BornAgain");
QApplication::setApplicationVersion(GUI::Util::Path::getBornAgainVersionString()); app.setApplicationVersion(GUI::Util::Path::getBornAgainVersionString());
QApplication::setOrganizationName("BornAgain"); app.setOrganizationName("BornAgain");
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
QApplication::setWindowIcon(QIcon(":/images/BornAgain.ico")); app.setWindowIcon(QIcon(":/images/BornAgain.ico"));
#endif #endif
ApplicationSettings applicationSettings; ApplicationSettings applicationSettings;
...@@ -62,8 +62,9 @@ int main(int argc, char* argv[]) ...@@ -62,8 +62,9 @@ int main(int argc, char* argv[])
win.loadProject(options.projectFile()); win.loadProject(options.projectFile());
win.show(); win.show();
int ret = -1;
try { try {
return QApplication::exec(); ret = app.exec();
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
QMessageBox msgbox(QMessageBox::Critical, "BornAgain: fatal bug", QMessageBox msgbox(QMessageBox::Critical, "BornAgain: fatal bug",
QString("Sorry, you encountered a fatal bug.\n" QString("Sorry, you encountered a fatal bug.\n"
...@@ -72,5 +73,7 @@ int main(int argc, char* argv[]) ...@@ -72,5 +73,7 @@ int main(int argc, char* argv[])
+ ex.what() + "\n", + ex.what() + "\n",
QMessageBox::Ok, QApplication::activeWindow()); QMessageBox::Ok, QApplication::activeWindow());
msgbox.exec(); msgbox.exec();
return 1;
} }
return ret;
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment