Changeset 4341 in orxonox.OLD

Timestamp:

May 27, 2005, 9:27:27 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: small folder-check-update

File:

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

orxonox/trunk/src/util/resource_manager.cc

@@ -87 +87 @@
 bool ResourceManager::setDataDir(const char* dataDir)
 {
-  if (isDir(dataDir))
+  char* realDir = ResourceManager::homeDirCheck(dataDir);
+  if (isDir(realDir))
     {
       delete this->dataDir;
-      this->dataDir = new char[strlen(dataDir)+1];
-      strcpy(this->dataDir, dataDir);
+      this->dataDir = new char[strlen(realDir)+1];
+      strcpy(this->dataDir, realDir);
+      delete realDir;
       return true;
     }
@@ -97 +99 @@
     {
       PRINTF(1)("%s is not a Directory, and can not be the Data Directory, leaving as %s \n", dataDir, this->dataDir);
+      delete realDir;
       return false;
     }