--- a/ChangesBrowser.st	Sun Jan 09 19:40:12 2005 +0100
+++ b/ChangesBrowser.st	Tue Jan 11 17:30:26 2005 +0100
@@ -1499,23 +1499,30 @@
 checkClassIsLoaded:aClass
     "check for and warn if a class is unloaded (helper for compare-change)"
 
-    |cls|
+    |cls answer|
 
     cls := aClass theNonMetaclass.
     cls isLoaded ifTrue:[
         ^ true.
     ].
 
-    (self confirm:(resources 
+    answer := (self confirmWithCancel:(resources 
                     string:'%1 is an autoloaded class.\I can only compare the methods source if its loaded first.\\Shall the class be loaded now ?'
-                    with:cls name allBold) withCRs)
-    ifFalse:[
-        AbortOperationRequest raise
+                    with:cls name allBold) withCRs).
+
+    answer == true ifTrue:[
+        ^ cls autoload isLoaded
     ].
-    ^ cls autoload isLoaded
-
-    "Created: / 12.12.1995 / 14:04:39 / cg"
-    "Modified: / 5.11.2001 / 16:34:29 / cg"
+
+    answer isNil ifTrue:[
+        "cancel the operation"
+        AbortAllOperationRequest raiseRequest.
+        ^ false.
+    ].
+
+    "cancel operation for this change, (but possibly continue with others)"
+    AbortOperationRequest raiseRequest.
+    ^ false.
 !
 
 clearCodeView
@@ -4635,9 +4642,11 @@
     toDelete := OrderedCollection new.
     self withExecuteCursorDo:[
         1 to:self numberOfChanges do:[:changeNr |
-            (self compareChange:changeNr showResult:false) == true ifTrue:[
-                toDelete add:changeNr
-            ]
+            [
+                (self compareChange:changeNr showResult:false) == true ifTrue:[
+                    toDelete add:changeNr
+                ]
+            ] on:AbortOperationRequest do:[:ex|  "ignore unloaded clases" ]
         ].
     ].
 
@@ -5583,5 +5592,5 @@
 !ChangesBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.323 2004-09-28 08:30:46 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.324 2005-01-11 16:30:26 stefan Exp $'
 ! !