Changeset 930 for code/branches/network/src/orxonox/Orxonox.cc

Timestamp:

Mar 27, 2008, 12:45:47 AM (17 years ago)

Author:

rgrieder

Message:

• fixed deletion bugs in regard to the singleton behavior

File:

• code/branches/network/src/orxonox/Orxonox.cc (modified) (3 diffs)

code/branches/network/src/orxonox/Orxonox.cc

@@ -46 +46 @@
 //#include <exception>
 #include <deque>
+#define _CRTDBG_MAP_ALLOC
+#include <stdlib.h>
+#include <crtdbg.h>
 
 //***** ORXONOX ****
@@ -97 +100 @@
   {
     // keep in mind: the order of deletion is very important!
-
     if (this->bulletMgr_)
       delete this->bulletMgr_;
@@ -103 +105 @@
       delete this->orxonoxHUD_;
     Loader::close();
-    this->inputHandler_->destroy();
+    // do not destroy the InputHandler since this is a singleton too
+    // and might have been deleted already (after return 0; in main())
     if (this->auMan_)
       delete this->auMan_;