From 52cd2cbd7eb62648ae13f600c125116e8cdfc89d Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Sun, 16 Jan 2011 00:08:52 +0100 Subject: Core/Maps: Unload transports in MapManager::UnloadAll instead of singleton destructor. Core/Transports: Properly delink units from transports on transport desutruction. - Thanks to Shauren for help. Core/ObjectAccessor: Unload corpse 'storage' in added UnloadAll method called in WorldRunnable postservice hook. Core/Master: Change some postservice queries to syncrhonous (direct) execution to ensure execution on shutdown Core/Master: Remove redundant calls to ACE::init and ACE::fini These changes were made to fix crash/freeze issues on shutdown. --- src/server/worldserver/Main.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/server/worldserver/Main.cpp') diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index bc861e6b039..10b7e00aa99 100755 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -72,8 +72,6 @@ void usage(const char *prog) /// Launch the Trinity server extern int main(int argc, char **argv) { - ACE::init(); - ///- Command line parsing to get the configuration file name char const* cfg_file = _TRINITY_CORE_CONFIG; int c=1; @@ -151,8 +149,6 @@ extern int main(int argc, char **argv) // 1 - shutdown at error // 2 - restart command used, this code can be used by restarter for restart Trinityd - ACE::fini(); - return ret; } -- cgit v1.2.3