fix: nullptr access for logger in master (#1380)

* fix nullptr access for logger

* fix nullptr access for logger

fix no save on crash

* Update MasterServer.cpp
This commit is contained in:
David Markowitz
2024-01-02 16:28:17 -08:00
committed by GitHub
parent b1134b340f
commit bb79528c0e
2 changed files with 9 additions and 1 deletions

View File

@@ -1291,14 +1291,17 @@ void WorldShutdownProcess(uint32_t zoneId) {
}
void WorldShutdownSequence() {
bool shouldShutdown = Game::ShouldShutdown() || worldShutdownSequenceComplete;
Game::lastSignal = -1;
#ifndef DARKFLAME_PLATFORM_WIN32
if (Game::ShouldShutdown() || worldShutdownSequenceComplete)
if (shouldShutdown)
#endif
{
return;
}
if (!Game::logger) return;
LOG("Zone (%i) instance (%i) shutting down outside of main loop!", Game::server->GetZoneID(), instanceID);
WorldShutdownProcess(Game::server->GetZoneID());
FinalizeShutdown();