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

use QApplication instance; set return values

parent 3266c782
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !1518. Comments created here will be created in the context of that merge request.
......@@ -36,11 +36,11 @@ int main(int argc, char* argv[])
qRegisterMetaType<QVector<double>>("QVector<double>");
QApplication app(argc, argv);
QApplication::setApplicationName("BornAgain");
QApplication::setApplicationVersion(GUI::Util::Path::getBornAgainVersionString());
QApplication::setOrganizationName("BornAgain");
app.setApplicationName("BornAgain");
app.setApplicationVersion(GUI::Util::Path::getBornAgainVersionString());
app.setOrganizationName("BornAgain");
#ifndef Q_OS_MAC
QApplication::setWindowIcon(QIcon(":/images/BornAgain.ico"));
app.setWindowIcon(QIcon(":/images/BornAgain.ico"));
#endif
ApplicationSettings applicationSettings;
......@@ -62,8 +62,9 @@ int main(int argc, char* argv[])
win.loadProject(options.projectFile());
win.show();
int ret = -1;
try {
return QApplication::exec();
ret = app.exec();
} catch (const std::exception& ex) {
QMessageBox msgbox(QMessageBox::Critical, "BornAgain: fatal bug",
QString("Sorry, you encountered a fatal bug.\n"
......@@ -72,5 +73,7 @@ int main(int argc, char* argv[])
+ ex.what() + "\n",
QMessageBox::Ok, QApplication::activeWindow());
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