Index: startxwin.bat
===================================================================
--- startxwin.bat	(revision 7029)
+++ startxwin.bat	(working copy)
@@ -51,9 +51,12 @@
 
 REM Description of XWin-specific options is in XWin(1) manpage.
 
-%RUN% XWin -multiwindow -clipboard -silent-dup-error
+%RUN% bash -l -c "XWin -multiwindow -clipboard -silent-dup-error"
 
+REM Make sure XWin is ready to accept connections before proceeding
 
+%RUN% checkX -d %DISPLAY% -t 12
+
 REM Startup an xterm, using bash as the shell.
 
 %RUN% xterm -e /usr/bin/bash -l
Index: startxwin.sh
===================================================================
--- startxwin.sh	(revision 7029)
+++ startxwin.sh	(working copy)
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash -l
 export DISPLAY=127.0.0.1:0.0
 export PATH=/usr/bin:"$PATH"
 
@@ -26,7 +26,10 @@
 
 XWin -multiwindow -clipboard -silent-dup-error &
 
+# Make sure XWin is ready to accept connections before proceeding
 
+checkX -d $DISPLAY -t 12
+
 # Startup an xterm, using bash as the shell.
 
 xterm -e /usr/bin/bash -l &