--- a/Cursor.st	Tue Nov 14 19:14:06 1995 +0100
+++ b/Cursor.st	Tue Nov 14 19:32:35 1995 +0100
@@ -44,7 +44,7 @@
 !
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Cursor.st,v 1.23 1995-11-11 15:48:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Cursor.st,v 1.24 1995-11-14 18:32:35 cg Exp $'
 !
 
 documentation
@@ -217,9 +217,11 @@
 flushDeviceCursors
     "unassign all cursors from their device"
 
-    Lobby do:[:aCursor |
-	aCursor restored.
-	Lobby registerChange:aCursor
+    Lobby notNil ifTrue:[
+        Lobby do:[:aCursor |
+	    aCursor restored.
+	    Lobby registerChange:aCursor
+    	]
     ]
 !
 
@@ -297,6 +299,9 @@
     |newCursor|
 
     "first look if not already known"
+    Lobby isNil ifTrue:[
+    	self initialize
+    ].
     Lobby do:[:aCursor |
 	(aCursor sourceForm == sourceForm) ifTrue:[
 	    (aCursor maskForm == maskForm) ifTrue:[
@@ -397,6 +402,9 @@
     |newCursor|
 
     "first look if not already known"
+    Lobby isNil ifTrue:[
+    	self initialize
+    ].
     Lobby do:[:aCursor |
 	(aCursor shape == aShape) ifTrue:[
 	    ^ aCursor
@@ -414,6 +422,9 @@
     |newCursor oldCursor|
 
     "first look if not already known"
+    Lobby isNil ifTrue:[
+    	self initialize
+    ].
     Lobby do:[:aCursor |
 	(aCursor shape == aShape) ifTrue:[
 	    (aCursor device == aDevice) ifTrue:[^ aCursor].