jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-11 00:24:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

more ISL code, mutex fixes

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2012-03-12 00:36:44 +01:00
parent 0ae18d7b2e
commit 572e4eaafa
9 changed files with 107 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
servatrice/src/isl_interface.cpp
View file

@ -107,7 +107,7 @@ void IslInterface::initServer()
while (roomIterator.hasNext()) {
Server_Room *room = roomIterator.next().value();
room->roomMutex.lock();
event.add_room_list()->CopyFrom(room->getInfo(true, true, false));
event.add_room_list()->CopyFrom(room->getInfo(true, true, false, false));
}
IslMessage message;

1
servatrice/src/servatrice.cpp
View file

@ -856,6 +856,7 @@ void Servatrice::addIslInterface(int serverId, IslInterface *interface)
islInterfaces.insert(serverId, interface);
connect(interface, SIGNAL(externalUserJoined(ServerInfo_User)), this, SLOT(externalUserJoined(ServerInfo_User)));
connect(interface, SIGNAL(externalUserLeft(QString)), this, SLOT(externalUserLeft(QString)));
connect(interface, SIGNAL(externalRoomUpdated(ServerInfo_Room)), this, SLOT(externalRoomUpdated(const ServerInfo_Room &)));
}
void Servatrice::removeIslInterface(int serverId)