Changeset 9110 in orxonox.OLD for trunk/src/subprojects

Timestamp:

Jul 4, 2006, 11:18:41 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the Presentation back

File:

• trunk/src/subprojects/framework.cc (modified) (3 diffs)

trunk/src/subprojects/framework.cc

@@ -34 +34 @@
   LightManager::getInstance();
 
-  std::string dataPath = //Preferences::getInstance()->getString(CONFIG_SECTION_DATA, CONFIG_NAME_DATADIR, "");
+  std::string dataPath = //Preferences::getInstance()->getString(CONFIG_SECTION_GENERAL, CONFIG_NAME_DATADIR, "");
       "/home/boenzlip/orxonox/data/trunk/";
   printf("%s\n", dataPath.c_str());
@@ -52 +52 @@
     ResourceManager::getInstance()->getDataDir().c_str(),
     DEFAULT_CONFIG_FILE,
-    CONFIG_SECTION_DATA,
+    CONFIG_SECTION_GENERAL,
     CONFIG_NAME_DATADIR);
     exit(-1);
@@ -317 +317 @@
   delete GraphicsEngine::getInstance();
 
+  Framework::singletonRef = NULL;
 }