Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- attempt to fix the segfault reported by tomreyn when headless admin disconnects from the server

This commit is contained in:
Mark Vejvoda 2012-12-19 19:55:49 +00:00
parent 848b5fed07
commit c14c9ebc2d
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/glest_game/network/server_interface.cpp
View File

@ -1361,7 +1361,7 @@ void ServerInterface::update() {
int iFirstConnectedSlot = -1; int iFirstConnectedSlot = -1;
for(int i= 0; i < GameConstants::maxPlayers; ++i) { for(int i= 0; i < GameConstants::maxPlayers; ++i) {
MutexSafeWrapper safeMutexSlot(slotAccessorMutexes[i],CODE_AT_LINE_X(i)); MutexSafeWrapper safeMutexSlot(slotAccessorMutexes[i],CODE_AT_LINE_X(i));
if(slots[i] != NULL) { if(slots[i] != NULL && slots[i]->isConnected() == true) {
if(iFirstConnectedSlot < 0) { if(iFirstConnectedSlot < 0) {
iFirstConnectedSlot = i; iFirstConnectedSlot = i;
} }
@ -1375,13 +1375,17 @@ void ServerInterface::update() {
if(foundAdminSlot == false && iFirstConnectedSlot >= 0) { if(foundAdminSlot == false && iFirstConnectedSlot >= 0) {
printf("Switching masterserver admin to slot#%d...\n",iFirstConnectedSlot); printf("Switching masterserver admin to slot#%d...\n",iFirstConnectedSlot);
string sMsg = "Switching player to admin mode: " + slots[iFirstConnectedSlot]->getName(); MutexSafeWrapper safeMutexSlot(slotAccessorMutexes[iFirstConnectedSlot],CODE_AT_LINE_X(iFirstConnectedSlot));
sendTextMessage(sMsg,-1, true,""); if(slots[iFirstConnectedSlot] != NULL) {
string sMsg = "Switching player to admin mode: " + slots[iFirstConnectedSlot]->getName();
sendTextMessage(sMsg,-1, true,"");
this->gameSettings.setMasterserver_admin(slots[iFirstConnectedSlot]->getSessionKey()); this->gameSettings.setMasterserver_admin(slots[iFirstConnectedSlot]->getSessionKey());
this->gameSettings.setMasterserver_admin_faction_index(slots[iFirstConnectedSlot]->getPlayerIndex()); this->gameSettings.setMasterserver_admin_faction_index(slots[iFirstConnectedSlot]->getPlayerIndex());
this->broadcastGameSetup(&this->gameSettings); safeMutexSlot.ReleaseLock();
this->broadcastGameSetup(&this->gameSettings);
}
} }
} }
//printf("\nServerInterface::update -- G\n"); //printf("\nServerInterface::update -- G\n");