jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed #45: Terminate servatrice if critical error in e.g. listen() happens during initialization

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2012-05-01 10:58:08 +02:00
parent 875610e1b3
commit 7c8b3fc5e3
3 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

20
servatrice/src/main.cpp
View file

@ -165,15 +165,17 @@ int main(int argc, char *argv[])
Servatrice *server = new Servatrice(settings);
QObject::connect(server, SIGNAL(logDebugMessage(QString, void *)), logger, SLOT(logMessage(QString, void *)));
QObject::connect(server, SIGNAL(destroyed()), &app, SLOT(quit()), Qt::QueuedConnection);
std::cerr << "-------------------------" << std::endl;
std::cerr << "Server initialized." << std::endl;
qInstallMsgHandler(myMessageOutput);
int retval = app.exec();
std::cerr << "Server quit." << std::endl;
std::cerr << "-------------------------" << std::endl;
int retval = 0;
if (server->initServer()) {
std::cerr << "-------------------------" << std::endl;
std::cerr << "Server initialized." << std::endl;
qInstallMsgHandler(myMessageOutput);
retval = app.exec();
std::cerr << "Server quit." << std::endl;
std::cerr << "-------------------------" << std::endl;
}
delete rng;
delete settings;