--- a/ResourcePack.st	Mon Sep 18 10:52:55 2006 +0200
+++ b/ResourcePack.st	Mon Sep 18 10:54:02 2006 +0200
@@ -296,11 +296,8 @@
         rsrcDir exists ifFalse:[^ nil].
     ].
 
-    pack := self fromFile:'resources.rs' directory:rsrcDir.
+    pack := self fromFile:'resources.rs' directory:rsrcDir cached:cached.
     pack packsClassOrFileName:fullName.
-    cached ifTrue:[
-        self addToCache:pack.
-    ].
     ^ pack
 
     "
@@ -309,8 +306,7 @@
 !
 
 fromFile:aFileName
-    "get the resource definitions from a file in the default directory.
-     Uncached low-level entry."
+    "get the resource definitions from a file in the default directory."
 
     ^ self fromFile:aFileName directory:'resources'
 
@@ -324,6 +320,12 @@
 !
 
 fromFile:aFileName directory:dirName
+    "get the resource definitions from a file in a directory."
+
+    ^ self fromFile:aFileName directory:dirName cached:false
+!
+
+fromFile:aFileName directory:dirName cached:cached
     "get the resource definitions from a file in a directory.
      Uncached low-level entry."
 
@@ -331,6 +333,9 @@
 
     newPack := self new.
     newPack readFromFile:aFileName directory:dirName.
+    cached ifTrue:[
+        self addToCache:newPack.
+    ].
     ^ newPack
 ! !
 
@@ -1150,7 +1155,7 @@
 !ResourcePack class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.110 2006-09-13 17:08:13 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.111 2006-09-18 08:54:02 cg Exp $'
 ! !
 
 ResourcePack initialize!