Merge branch 'master' into travis

This commit is contained in:
Simon Detheridge 2015-07-28 16:39:55 +01:00
commit df64fb4b1e

View File

@ -44,9 +44,18 @@ int main(int argc, char *argv[])
"}" );
#endif
Fractorium w;
w.show();
a.installEventFilter(&w);
return a.exec();
int rv = -1;
try
{
Fractorium w;
w.show();
a.installEventFilter(&w);
rv = a.exec();
} catch (const char *e) {
QMessageBox::critical(0, "Fatal Error", e);
}
return rv;
}