Changeset 4053 in orxonox.OLD

Timestamp:

May 5, 2005, 1:25:56 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/guiMerge: deleted a F bug in orxonox.cc: f delete of not NULL parameter into nothingness
@patrick: could you have a look, at what is needed from the variables changed to NULL in initialisation??

Location:

orxonox/branches/guiMerge/src

Files:

• lib/gui/gui/gui_gtk.cc (modified) (1 diff)
• orxonox.cc (modified) (3 diffs)

orxonox/branches/guiMerge/src/lib/gui/gui/gui_gtk.cc

@@ -75 +75 @@
   PRINT(0)("================================\n");
   PRINT(0)("= ORXONOX CONFIGURATION WIZARD =\n");
-  PRINT(0)("================================    - version:" PACKAGE_VERSION "\n");
+  PRINT(0)("================================ - v." PACKAGE_VERSION "\n");
 
   while(true)

orxonox/branches/guiMerge/src/orxonox.cc

@@ -50 +50 @@
 {
   pause = false;
+  this->world = NULL;
+  this->resources = NULL;
+  this->localinput = NULL;
 }
 
@@ -57 +60 @@
 Orxonox::~Orxonox () 
 {
+  int i =0;
   Orxonox::singletonRef = NULL;
   if( world != NULL) delete world;
-  if( localinput != NULL) delete world;
+  if( localinput != NULL) delete localinput;
   if( resources != NULL) delete resources;
   delete GraphicsEngine::getInstance(); // deleting the Graphics
@@ -364 +368 @@
   orx->start();
   
-  //  delete orx;
+  delete orx;
   ResourceManager::deleteFile("~/.orxonox/orxonox.lock");