--- a/ViewStyle.st	Thu Jan 16 17:36:54 1997 +0100
+++ b/ViewStyle.st	Thu Jan 16 17:50:21 1997 +0100
@@ -108,22 +108,26 @@
 
 deviceResourceAt:aKey default:default
     "retrieve a resource - also aquire a device version
-     to avoid repeated allocations later"
+     for the default display, to avoid repeated allocations later"
 
     |aResource deviceResource device|
 
-    device := Display. "/ Screen current.
+    device := Display.
     aResource := self at:aKey default:default.
     aResource isNil ifTrue:[
-	aResource := default
+        aResource := default
     ].
     aResource notNil ifTrue:[
-	deviceResource := aResource on:device.
+        device notNil ifTrue:[
+            deviceResource := aResource on:device.
+        ]
     ].
     deviceResource notNil ifTrue:[
-	^ deviceResource
+        ^ deviceResource
     ].
     ^ aResource
+
+    "Modified: 16.1.1997 / 17:50:15 / cg"
 !
 
 doesNotUnderstand:aMessage
@@ -161,5 +165,5 @@
 !ViewStyle class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/ViewStyle.st,v 1.11 1996-07-25 20:57:46 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/ViewStyle.st,v 1.12 1997-01-16 16:50:21 cg Exp $'
 ! !