Changeset 5480 in orxonox.OLD for trunk/src/orxonox.cc

Timestamp:

Nov 3, 2005, 9:08:19 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better check for data-dir

File:

• trunk/src/orxonox.cc (modified) (2 diffs)

trunk/src/orxonox.cc

@@ -271 +271 @@
   if ((dataPath = this->iniParser->getVar(CONFIG_NAME_DATADIR, CONFIG_SECTION_DATA))!= NULL)
   {
-    if (!ResourceManager::getInstance()->setDataDir(dataPath))
+    if (!ResourceManager::getInstance()->setDataDir(dataPath) &&
+         !ResourceManager::getInstance()->verifyDataDir(DEFAULT_DATA_DIR_CHECKFILE))
     {
       PRINTF(1)("Data Could not be located in %s\n", dataPath);
@@ -277 +278 @@
   }
 
-  if (!ResourceManager::getInstance()->checkDataDir(DEFAULT_DATA_DIR_CHECKFILE))
+  if (!ResourceManager::getInstance()->verifyDataDir(DEFAULT_DATA_DIR_CHECKFILE))
   {
     PRINTF(1)("The DataDirectory %s could not be verified\n" \