--- a/XWorkstat.st	Mon May 25 14:01:25 1998 +0200
+++ b/XWorkstat.st	Thu May 28 16:11:28 1998 +0200
@@ -4985,6 +4985,10 @@
     if (ISCONNECTED) {
 	Display *dpy = myDpy;
 
+	if (XEventsQueued(dpy, QueuedAlready)) {
+	    RETURN (true);
+	}
+
 	ENTER_XLIB();
 	if (doSync == true) {
 	    XSync(dpy, 0);      /* make certain everything is flushed */
@@ -5019,11 +5023,12 @@
     OBJ rslt = false;
 
     if (ISCONNECTED) {
-	ENTER_XLIB();
+	/* ENTER ... LEAVE not needed; XEventsQueued will not block */
+	/* ENTER_XLIB(); */
 	if (XEventsQueued(myDpy, QueuedAlready)) {
 	    rslt = true;
 	}
-	LEAVE_XLIB();
+	/* LEAVE_XLIB(); */
     }
     RETURN ( false );
 %}
@@ -9901,6 +9906,6 @@
 !XWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.280 1998-04-28 14:23:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.281 1998-05-28 14:11:28 cg Exp $'
 ! !
 XWorkstation initialize!

--- a/XWorkstation.st	Mon May 25 14:01:25 1998 +0200
+++ b/XWorkstation.st	Thu May 28 16:11:28 1998 +0200
@@ -4985,6 +4985,10 @@
     if (ISCONNECTED) {
 	Display *dpy = myDpy;
 
+	if (XEventsQueued(dpy, QueuedAlready)) {
+	    RETURN (true);
+	}
+
 	ENTER_XLIB();
 	if (doSync == true) {
 	    XSync(dpy, 0);      /* make certain everything is flushed */
@@ -5019,11 +5023,12 @@
     OBJ rslt = false;
 
     if (ISCONNECTED) {
-	ENTER_XLIB();
+	/* ENTER ... LEAVE not needed; XEventsQueued will not block */
+	/* ENTER_XLIB(); */
 	if (XEventsQueued(myDpy, QueuedAlready)) {
 	    rslt = true;
 	}
-	LEAVE_XLIB();
+	/* LEAVE_XLIB(); */
     }
     RETURN ( false );
 %}
@@ -9901,6 +9906,6 @@
 !XWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.280 1998-04-28 14:23:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.281 1998-05-28 14:11:28 cg Exp $'
 ! !
 XWorkstation initialize!