From fe1289ed1acaf856e1751966994d492c562d6ec2 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Thu, 17 Jul 2014 19:55:55 +0200 Subject: Core/Misc: Fix abort() on shutdown on *nix Wait for cliThead to exit before deleting it to about std::abort() triggered on *nix systems. --- src/server/worldserver/Main.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/server/worldserver/Main.cpp') 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; } -- cgit v1.2.3