--- a/XWorkstation.st	Sun Sep 03 15:37:59 2000 +0200
+++ b/XWorkstation.st	Mon Sep 04 14:25:27 2000 +0200
@@ -10923,15 +10923,16 @@
     if (ISCONNECTED
      && __isExternalAddress(aWindowId)
      && __isExternalAddress(aCursorId)) {
-	Window w = _WindowVal(aWindowId);
-	Cursor c = _CursorVal(aCursorId);
-
-	if (w && c) {
-	    ENTER_XLIB();
-	    XDefineCursor(myDpy, w, c);
-	    LEAVE_XLIB();
-	}
-	RETURN ( self );
+        Display *dpy = myDpy;
+        Window w = _WindowVal(aWindowId);
+        Cursor c = _CursorVal(aCursorId);
+
+        if (w && c && dpy) {
+            ENTER_XLIB();
+            XDefineCursor(dpy, w, c);
+            LEAVE_XLIB();
+        }
+        RETURN ( self );
     }
 %}.
     self primitiveFailed
@@ -11420,6 +11421,6 @@
 !XWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.369 2000-08-22 23:22:05 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.370 2000-09-04 12:25:27 cg Exp $'
 ! !
 XWorkstation initialize!