Explorar o código

fix to watchdog code to remove zone entry in iterator when we force shutdown

image %!s(int64=3) %!d(string=hai) anos
pai
achega
56a987274d
Modificáronse 1 ficheiros con 1 adicións e 0 borrados
  1. 1 0
      EQ2/source/WorldServer/World.cpp

+ 1 - 0
EQ2/source/WorldServer/World.cpp

@@ -2326,6 +2326,7 @@ void ZoneList::WatchdogHeartbeat()
 				tmp->SetWatchdogTime(Timer::GetCurrentTime2()); // reset so we don't continuously flood this heartbeat
 				LogWrite(WORLD__ERROR, 1, "World", "Zone %s is hung for %i.. attempting to cancel threads...", tmp->GetZoneName(), diff);
 				tmp->CancelThreads();
+				zlist.erase(zone_iter);
 				MZoneList.releasewritelock(__FUNCTION__, __LINE__);
 				safe_delete(tmp);
 				match = true;