Changeset 3677 in orxonox.OLD for orxonox/trunk/src/lib/util/resource_manager.cc

Timestamp:

Mar 30, 2005, 6:15:46 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more output info, some fixes in resourceManager

File:

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

orxonox/trunk/src/lib/util/resource_manager.cc

@@ -175 +175 @@
   // searching if the resource was loaded before.
   Resource* tmpResource = this->locateResourceByName(fileName);
-  if (!tmpResource) // if the resource was not loaded before.
+  if (tmpResource) // if the resource was not loaded before.
+    {
+      PRINTF(4)("not loading cached resource %s\n", tmpResource->name);
+      tmpResource->count++;
+      if(tmpResource->prio < prio)
+        tmpResource->prio = prio;
+    }
+  else
     {
       char* tmpDir;
@@ -252 +259 @@
       delete []fullName;
     }
-  else
-    {
-      PRINTF(4)("not loading cached resource %s\n", tmpResource->name);
-      tmpResource->count++;
-      if(tmpResource->prio < prio)
-        tmpResource->prio = prio;
-    }
 
   return tmpResource->pointer;
@@ -330 +330 @@
     {
       if (enumRes->prio <= prio)
-        unload(enumRes, prio);
+        if (enumRes->count == 0)
+          unload(enumRes, prio);
+        else
+          PRINTF(2)("unable to unload %s because there are still %d references to it\n",
+                   enumRes->name, enumRes->count);
       //enumRes = resourceList->nextElement();
       enumRes = iterator->nextElement();