aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2014-07-17 19:55:55 +0200
committerjackpoz <giacomopoz@gmail.com>2014-07-17 20:54:32 +0200
commitfe1289ed1acaf856e1751966994d492c562d6ec2 (patch)
treeb5b5af1f654e2fc5a8e51192a322dcdc4c54f01b /src
parent784676859b997ffc58f63cc04a951c44d5fb685a (diff)
Core/Misc: Fix abort() on shutdown on *nix
Wait for cliThead to exit before deleting it to about std::abort() triggered on *nix systems.
Diffstat (limited to 'src')
-rw-r--r--src/server/worldserver/Main.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index a7b430a4e97..0c051eae37a 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -311,11 +311,8 @@ extern int main(int argc, char** argv)
b[3].Event.KeyEvent.wRepeatCount = 1;
DWORD numb;
WriteConsoleInput(hStdIn, b, 4, &numb);
-
- cliThread->join();
-
#endif
-
+ cliThread->join();
delete cliThread;
}