--- a/TestRunner.st	Fri Dec 14 00:13:18 2001 +0100
+++ b/TestRunner.st	Fri Dec 14 00:15:47 2001 +0100
@@ -359,15 +359,11 @@
     "*** (which may not be the one you wanted)"
     "*** Please change as required and accept it in the browser."
 
-    |holder|
-
-    (holder := builder bindingAt:#script) isNil ifTrue:[
-	holder := ValueHolder new.
-	builder aspectAt:#script put:holder.
-	holder onChangeSend:#scriptSelectionChanged to:self.
-"/        holder addDependent:self.
+    script isNil ifTrue:[
+        script := ValueHolder new.
+        script onChangeSend:#suiteSelectionChanged to:self.
     ].
-    ^ holder.
+    ^ script.
 
     "Created: / 21.6.2000 / 12:04:36 / Sames"
 !
@@ -458,7 +454,23 @@
 !
 
 categorySelectionChanged
-    self updateSuitesList
+    |selectedScriptIndex selectedScript oldSuitesList newSuitesList|
+
+    selectedScriptIndex := self script value.
+    oldSuitesList := self scriptModel value.
+
+    selectedScriptIndex notNil ifTrue:[
+        selectedScript := (oldSuitesList at:selectedScriptIndex) string
+    ].
+
+    self updateSuitesList.
+
+    newSuitesList := self scriptModel value.
+    (newSuitesList includes: selectedScript) ifFalse:[
+        self script value: nil.
+    ] ifTrue:[
+        self script value: (newSuitesList indexOf:selectedScript)
+    ].
 !
 
 debugSelectedFailure
@@ -680,7 +692,7 @@
 suiteSelectionChanged
     |ok className description  cls|
 
-    self enableRunButton value:(ok := self freshTestSuite notNil).
+    self enableRunButton value:(ok := self freshTestSuite notNil and:[self script value notNil]).
     self enableRunDefectsButton value:(ok and:[allDefects size > 0]).
 
     self script value notNil ifTrue:[
@@ -907,9 +919,9 @@
 !
 
 displayPass
+    self displayGreen.
     self displayMode: 'Pass'.
     self displayDetails: result runCount printString , ' run' , self timeSinceLastPassAsString.
-    self displayGreen.
     lastPass := Time now
 
     "Modified: / 21.6.2000 / 12:14:52 / Sames"
@@ -1014,5 +1026,5 @@
 !TestRunner class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/goodies/sunit/TestRunner.st,v 1.25 2001-12-13 22:43:25 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/sunit/TestRunner.st,v 1.26 2001-12-13 23:15:47 cg Exp $'
 ! !