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

changed mutex lock

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2011-04-19 04:13:23 +02:00
parent e978624e3f
commit d0b8c6ebd9
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/server_protocolhandler.cpp
View file

@ -24,11 +24,12 @@ Server_ProtocolHandler::~Server_ProtocolHandler()
} }
// This is essentially the destructor, but it needs to be called from the // This is essentially the destructor, but it needs to be called from the
// child's destructor with the server mutex locked. Otherwise, the mutex // child's destructor so that the server mutex does not get unlocked during
// could get unlocked while the object is not finished being destroyed, // finalization.
// leading to calls to pure virtual functions.
void Server_ProtocolHandler::prepareDestroy() void Server_ProtocolHandler::prepareDestroy()
{ {
QMutexLocker locker(&server->serverMutex);
server->removeClient(this); server->removeClient(this);
QMapIterator<int, Server_Room *> roomIterator(rooms); QMapIterator<int, Server_Room *> roomIterator(rooms);

1
servatrice/src/serversocketinterface.cpp
View file

@ -60,7 +60,6 @@ ServerSocketInterface::ServerSocketInterface(Servatrice *_server, QTcpSocket *_s
ServerSocketInterface::~ServerSocketInterface() ServerSocketInterface::~ServerSocketInterface()
{ {
QMutexLocker locker(&servatrice->serverMutex);
logger->logMessage("ServerSocketInterface destructor"); logger->logMessage("ServerSocketInterface destructor");
prepareDestroy(); prepareDestroy();