Changeset 3103

Timestamp:

May 28, 2009, 4:56:37 AM (15 years ago)

Author:

scheusso

Message:

some fixes and changes (also signalhandler)

Location:

code/trunk/src

Files:

• core/Core.cc (modified) (2 diffs)
• orxonox/GraphicsManager.cc (modified) (1 diff)
• orxonox/objects/gametypes/TeamBaseMatch.cc (modified) (1 diff)

code/trunk/src/core/Core.cc

@@ -181 +181 @@
         delete this->languageInstance_;
         delete this->configFileManager_;
-        delete this->signalHandler_;
 
         // Destroy command line arguments
@@ -190 +189 @@
         assert(Core::singletonRef_s);
         Core::singletonRef_s = 0;
+        delete this->signalHandler_;
     }
 

code/trunk/src/orxonox/GraphicsManager.cc

@@ -141 +141 @@
                 delete this->ogreWindowEventListener_;
             }
+
+            // destroy render window
+//            Ogre::RenderSystem* renderer = this->ogreRoot_->getRenderSystem();
+//            renderer->destroyRenderWindow("Orxonox");
 
             // unload all compositors

code/trunk/src/orxonox/objects/gametypes/TeamBaseMatch.cc

@@ -54 +54 @@
         if (base)
         {
+            if ( !originator )
+                return false;
             std::set<TeamBaseMatchBase*>::const_iterator it = this->bases_.find(base);
             if (it != this->bases_.end())