--- a/Tools__InheritanceClassList.st	Thu Apr 04 01:43:18 2013 +0100
+++ b/Tools__InheritanceClassList.st	Thu Apr 04 19:06:16 2013 +0100
@@ -61,38 +61,35 @@
 delayedUpdate:something with:aParameter from:changedObject
     |top oldSelection newSelection showMeta|
 
-"/    self inSlaveModeOrInvisible ifTrue:[^ self].
-"/    self inSlaveMode ifTrue:[^ self].
+    self inSlaveModeOrInvisible ifTrue:[^ self].
+"/    (self slaveMode value == true) ifTrue:[^ self].
 
     changedObject == slaveMode ifTrue:[
-        self inSlaveMode ifTrue:[
-            self invalidateList.
-        ] ifFalse:[
-            listValid ifFalse:[
-                self updateList
-            ].
-        ].
-        ^  self
+	listValid ~~ true ifTrue:[
+	    self enqueueDelayedUpdateList
+	].
+	"/ self invalidateList.
+	^  self
     ].
 
     changedObject == meta ifTrue:[
-        oldSelection := self selectedClasses value ? #().
-        showMeta := meta value.
+	oldSelection := self selectedClasses value ? #().
+	showMeta := meta value.
 
-        newSelection := oldSelection collect:[:cls | showMeta ifTrue:[cls theMetaclass] ifFalse:[cls theNonMetaclass]].
-        newSelection := newSelection asOrderedCollection.
+	newSelection := oldSelection collect:[:cls | showMeta ifTrue:[cls theMetaclass] ifFalse:[cls theNonMetaclass]].
+	newSelection := newSelection asOrderedCollection.
 
-        top := self topClassHolder value.
-        top notNil ifTrue:[
-            top := showMeta ifTrue:[top theMetaclass] ifFalse:[top theNonMetaclass].
-            self topClassHolder value:top.
-        ].
-        self invalidateList.
+	top := self topClassHolder value.
+	top notNil ifTrue:[
+	    top := showMeta ifTrue:[top theMetaclass] ifFalse:[top theNonMetaclass].
+	    self topClassHolder value:top.
+	].
+	self invalidateList.
 
-        (newSelection includes:nil) ifTrue:[self halt:'should not happen'].
+(newSelection includes:nil) ifTrue:[self halt:'should not happen'].
 
-        self selectedClasses value:newSelection.
-        ^ self.
+	self selectedClasses value:newSelection.
+	^ self.
     ].
     super delayedUpdate:something with:aParameter from:changedObject