- Fix potential singleton memory deallocation problems

- Fix ¨mysql_global_end() 1 thread didn´t exit¨ error
Author: Derex

--HG--
branch : trunk

1 files changed, 7 insertions, 1 deletions

diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 71fd88ce7df..fd6ecdda8fa 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -74,6 +74,8 @@ 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;
@@ -144,12 +146,16 @@ extern int main(int argc, char **argv)
 
     ///- and run the 'Master'
     /// \todo Why do we need this 'Master'? Can't all of this be in the Main as for Realmd?
-    return sMaster.Run();
+    int ret = sMaster.Run();
 
     // at sMaster return function exist with codes
     // 0 - normal shutdown
     // 1 - shutdown at error
     // 2 - restart command used, this code can be used by restarter for restart Trinityd
+
+    ACE::fini();
+
+    return ret;
 }
 
 /// @}