mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2024-11-21 21:17:25 +00:00
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:
parent
b1134b340f
commit
bb79528c0e
@ -812,6 +812,7 @@ void HandlePacket(Packet* packet) {
|
||||
}
|
||||
|
||||
int ShutdownSequence(int32_t signal) {
|
||||
if (!Game::logger) return -1;
|
||||
LOG("Recieved Signal %d", signal);
|
||||
if (shutdownSequenceStarted) {
|
||||
LOG("Duplicate Shutdown Sequence");
|
||||
@ -900,9 +901,13 @@ int32_t FinalizeShutdown(int32_t signal) {
|
||||
//Delete our objects here:
|
||||
Database::Destroy("MasterServer");
|
||||
if (Game::config) delete Game::config;
|
||||
Game::config = nullptr;
|
||||
if (Game::im) delete Game::im;
|
||||
Game::im = nullptr;
|
||||
if (Game::server) delete Game::server;
|
||||
Game::server = nullptr;
|
||||
if (Game::logger) delete Game::logger;
|
||||
Game::logger = nullptr;
|
||||
|
||||
if (signal != EXIT_SUCCESS) exit(signal);
|
||||
return signal;
|
||||
|
@ -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();
|
||||
|
Loading…
Reference in New Issue
Block a user