--- a/display.rc	Thu Oct 19 12:20:29 2006 +0200
+++ b/display.rc	Thu Oct 19 12:21:48 2006 +0200
@@ -179,7 +179,7 @@
     "/ rdr notNil ifTrue:[
     "/    MIMETypes defineImageType:'video/x-sgi-movie' suffix:'movie' reader:rdr.
     "/ ].
-]
+].
 !
 
 "*
@@ -191,11 +191,12 @@
 
 |displayDevice displayVar display displayType s|
 
-displayDevice := Screen current.
-(displayDevice platformName = 'WIN32') ifTrue:[
+displayDevice := Display  "Screen current".
+displayDevice notNil ifTrue:[
+  (displayDevice platformName = 'WIN32') ifTrue:[
     "running on a local windows display"
     display := OperatingSystem getHostName.
-] ifFalse:[
+  ] ifFalse:[
     displayVar := displayDevice displayName.
     displayVar notNil ifTrue:[
 	"/ figure out the hostname of the display,
@@ -221,6 +222,7 @@
 	    ]
 	].
     ].
+  ].
 ].
 
 display isNil ifTrue:[