Skip to content
Snippets Groups Projects

Failed assertion throws runtime_error; message box moved to GUI main loop try..catch wrapper (#496)

Merged Wuttke, Joachim requested to merge i496j into r20.0
All threads resolved!
1 file
+ 8
5
Compare changes
  • Side-by-side
  • Inline
+ 8
5
@@ -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;
}
Loading