Changeset 930 for code/branches

Timestamp:

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

Author:

rgrieder

Message:

• fixed deletion bugs in regard to the singleton behavior

Location:

code/branches/network/src/orxonox

Files:

• InputHandler.cc (modified) (1 diff)
• Orxonox.cc (modified) (3 diffs)

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

@@ -129 +129 @@
   void InputHandler::destroy()
   {
-    if (!this->inputSystem_)
-    {
-      this->inputSystem_->destroyInputObject(this->mouse_);
-      this->inputSystem_->destroyInputObject(this->keyboard_);
+    if (this->mouse_)
+      this->inputSystem_->destroyInputObject(mouse_);
+    if (this->keyboard_)
+      this->inputSystem_->destroyInputObject(keyboard_);
+    if (this->inputSystem_)
       OIS::InputManager::destroyInputSystem(this->inputSystem_);
-    }
-
+
+    this->mouse_         = 0;
+    this->keyboard_      = 0;
+    this->inputSystem_   = 0;
     this->uninitialized_ = true;
   }

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_;