checkin from browser
authorClaus Gittinger <cg@exept.de>
Wed, 13 Oct 1999 18:22:51 +0200
changeset 2971 8dd578866ddc
parent 2970 928387584c9c
child 2972 ddec7f5c54ce
checkin from browser
ResourcePack.st
--- a/ResourcePack.st	Wed Oct 13 18:21:11 1999 +0200
+++ b/ResourcePack.st	Wed Oct 13 18:22:51 1999 +0200
@@ -211,10 +211,11 @@
 
     baseName := (Smalltalk fileNameForClass:nm) , '.rs'.
 
-    (prjDir notNil and:[(prjDir := prjDir asFilename) exists]) ifTrue:[
-        pack := self 
-                    fromFile:((prjDir construct:'resources') constructString:baseName)
-                    directory:nil.
+    (prjDir notNil 
+    and:[(prjDir := prjDir asFilename) exists
+    and:[(prjDir := prjDir construct:'resources') exists
+    and:[(prjDir construct:baseName) exists]]]) ifTrue:[
+        pack := self fromFile:(prjDir constructString:baseName) directory:nil.
     ] ifFalse:[
         pack := self fromFile:baseName.
     ].
@@ -730,6 +731,6 @@
 !ResourcePack class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.52 1999-10-13 16:21:11 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.53 1999-10-13 16:22:51 cg Exp $'
 ! !
 ResourcePack initialize!