diff options
author | Stefan Dombrowski <stefan@uni-bonn.de> | 2011-02-19 23:32:15 +0100 |
---|---|---|
committer | Stefan Dombrowski <stefan@uni-bonn.de> | 2011-02-19 23:32:15 +0100 |
commit | 93106af005c2727afec039456738a58709fee0d1 (patch) | |
tree | cb36ef2df4f790bae4e208994415337faf5b92f3 | |
parent | 88f1328ecb701776b30f60e02e16192efa354b27 (diff) | |
download | manaserv-93106af005c2727afec039456738a58709fee0d1.tar.gz manaserv-93106af005c2727afec039456738a58709fee0d1.tar.bz2 manaserv-93106af005c2727afec039456738a58709fee0d1.tar.xz manaserv-93106af005c2727afec039456738a58709fee0d1.zip |
Removing dublicate deinitialize of enet
Both servers deinitialize enet now from deinitializeServer().
Reviewed-by: Bertram, Jaxad0127
-rw-r--r-- | src/account-server/main-account.cpp | 3 | ||||
-rw-r--r-- | src/game-server/main-game.cpp | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/account-server/main-account.cpp b/src/account-server/main-account.cpp index eec8b9ed..b4f4c28b 100644 --- a/src/account-server/main-account.cpp +++ b/src/account-server/main-account.cpp @@ -138,9 +138,6 @@ static void initialize() signal(SIGINT, closeGracefully); signal(SIGTERM, closeGracefully); - // Set enet to quit on exit. - atexit(enet_deinitialize); - std::string logFile = Configuration::getValue("log_accountServerFile", DEFAULT_LOG_FILE); diff --git a/src/game-server/main-game.cpp b/src/game-server/main-game.cpp index 01cb6604..d7ce8c5d 100644 --- a/src/game-server/main-game.cpp +++ b/src/game-server/main-game.cpp @@ -219,9 +219,6 @@ static void initializeServer() exit(EXIT_NET_EXCEPTION); } - // Set enet to quit on exit. - atexit(enet_deinitialize); - // Pre-calculate the needed trigomic function values utils::math::init(); @@ -241,6 +238,9 @@ static void deinitializeServer() // Stop world timer worldTimer.stop(); + // Quit ENet + enet_deinitialize(); + // Destroy message handlers delete gameHandler; delete accountHandler; |