--- a/Java.st	Fri Jan 08 16:46:12 1999 +0000
+++ b/Java.st	Fri Jan 08 16:51:15 1999 +0000
@@ -607,7 +607,7 @@
 !
 
 startupJavaSystem
-    |haveEventThread haveScreenUpdater|
+    |javaEventThread haveEventThread haveScreenUpdater|
 
     FailedToLoadClasses := nil.
 
@@ -616,7 +616,8 @@
     "/
 
     haveEventThread := true.
-    (JavaEventThread isNil or:[JavaEventThread isDead]) ifTrue:[
+    javaEventThread := JavaVM javaEventThread.
+    (javaEventThread isNil or:[javaEventThread isDead]) ifTrue:[
         haveEventThread := false
     ].
 
@@ -643,7 +644,8 @@
         JavaVM initializeVM.
 
     ] ifFalse:[
-        (JavaEventThread isNil or:[JavaEventThread isDead]) ifTrue:[
+        javaEventThread := JavaVM javaEventThread.
+        (javaEventThread isNil or:[javaEventThread isDead]) ifTrue:[
             JavaVM initializeVM
 "/        ] ifFalse:[
 "/          'JAVA [info]: re-initializing JAVA classes ...' infoPrintCR.
@@ -656,7 +658,7 @@
      Java startupJavaSystem
     "
 
-    "Modified: / 17.11.1998 / 21:43:27 / cg"
+    "Modified: / 8.1.1999 / 17:05:48 / cg"
 !
 
 terminateAllThreads
@@ -681,6 +683,7 @@
         ]
     ].
     threadsToKill do:[:aThread |
+aThread == JavaVM javaScreenUpdaterThread ifTrue:[self halt].
         aThread terminate
     ].
     Threads := nil.
@@ -690,7 +693,7 @@
     "
 
     "Created: / 26.8.1997 / 19:57:40 / cg"
-    "Modified: / 1.2.1998 / 20:11:56 / cg"
+    "Modified: / 8.1.1999 / 17:17:28 / cg"
 ! !
 
 !Java class methodsFor:'enumerating'!
@@ -1331,6 +1334,6 @@
 !Java class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/Java.st,v 1.86 1999/01/04 22:56:35 cg Exp $'
+    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/Java.st,v 1.87 1999/01/08 16:50:40 cg Exp $'
 ! !
 Java initialize!