[Orxonox-commit 3037] r7733 - in code/branches/masterserver/src/orxonox: . gamestates

[smerkli at orxonox.net]

Author: smerkli
Date: 2010-12-08 15:36:53 +0100 (Wed, 08 Dec 2010)
New Revision: 7733

Modified:
   code/branches/masterserver/src/orxonox/Main.cc
   code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.cc
Log:
fixed a segfault

Modified: code/branches/masterserver/src/orxonox/Main.cc
===================================================================
--- code/branches/masterserver/src/orxonox/Main.cc	2010-12-08 14:29:28 UTC (rev 7732)
+++ code/branches/masterserver/src/orxonox/Main.cc	2010-12-08 14:36:53 UTC (rev 7733)
@@ -78,7 +78,6 @@
             "   level"
             " server,client"
             "  level"
-            " masterserver"
             );
 
             game->requestState("root");

Modified: code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.cc
===================================================================
--- code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.cc	2010-12-08 14:29:28 UTC (rev 7732)
+++ code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.cc	2010-12-08 14:36:53 UTC (rev 7733)
@@ -45,7 +45,6 @@
 
   GSMasterServer::~GSMasterServer()
   {
-    this->mserver->~MasterServer();
   }
 
   void GSMasterServer::activate()