aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2011-04-18 18:56:27 +02:00
commit 2c6d112ba4
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/server_room.cpp
View file

@ -84,7 +84,6 @@ Server_Game *Server_Room::createGame(const QString &description, const QString &
Server_Game *newGame = new Server_Game(creator, static_cast<Server *>(parent())->getNextGameId(), description, password, maxPlayers, gameTypes, onlyBuddies, onlyRegistered, spectatorsAllowed, spectatorsNeedPassword, spectatorsCanTalk, spectatorsSeeEverything, this); Server_Game *newGame = new Server_Game(creator, static_cast<Server *>(parent())->getNextGameId(), description, password, maxPlayers, gameTypes, onlyBuddies, onlyRegistered, spectatorsAllowed, spectatorsNeedPassword, spectatorsCanTalk, spectatorsSeeEverything, this);
newGame->moveToThread(thread()); newGame->moveToThread(thread());
newGame->setParent(this);
// This mutex needs to be unlocked by the caller. // This mutex needs to be unlocked by the caller.
newGame->gameMutex.lock(); newGame->gameMutex.lock();
games.insert(newGame->getGameId(), newGame); games.insert(newGame->getGameId(), newGame);

6
servatrice/src/main.cpp
View file

@ -75,7 +75,10 @@ void myMessageOutput(QtMsgType /*type*/, const char *msg)
void sigSegvHandler(int sig) void sigSegvHandler(int sig)
{ {
logger->logMessage("SIGSEGV"); if (sig == SIGSEGV)
logger->logMessage("CRASH: SIGSEGV");
else if (sig == SIGABRT)
logger->logMessage("CRASH: SIGABRT");
delete loggerThread; delete loggerThread;
raise(sig); raise(sig);
} }
@ -114,6 +117,7 @@ int main(int argc, char *argv[])
segv.sa_flags = SA_RESETHAND; segv.sa_flags = SA_RESETHAND;
sigemptyset(&segv.sa_mask); sigemptyset(&segv.sa_mask);
sigaction(SIGSEGV, &segv, 0); sigaction(SIGSEGV, &segv, 0);
sigaction(SIGABRT, &segv, 0);
#endif #endif
rng = new RNG_SFMT; rng = new RNG_SFMT;