Changeset 3283 for code/branches/netp6

Timestamp:

Jul 13, 2009, 4:59:10 PM (15 years ago)

Author:

rgrieder

Message:

Fixed a bug that caused the game to crash at random locations when shutting it down.

File:

• code/branches/netp6/src/orxonox/gamestates/GSDedicated.cc (modified) (2 diffs)

code/branches/netp6/src/orxonox/gamestates/GSDedicated.cc

@@ -85 +85 @@
 
         this->server_ = new Server(CommandLine::getValue("port"));
-        if( this->commandLine_ )
-          delete[] this->commandLine_;
         COUT(0) << "Loading scene in server mode" << std::endl;
 
@@ -104 +102 @@
         delete this->originalTerminalSettings_;
 #endif
-        //inputThread_->join();
+        COUT(0) << "Press enter to end the game..." << std::endl;
+        inputThread_->join();
         delete this->inputThread_;
+
+        if (this->commandLine_ )
+          delete[] this->commandLine_;
 
         GameMode::setHasServer(false);