--- a/Menu.st	Wed Jul 19 09:18:18 2017 +0200
+++ b/Menu.st	Fri Jul 21 20:24:36 2017 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1997 by eXept Software AG
               All Rights Reserved
@@ -602,7 +600,9 @@
 "/        receiver := aResourceContainerOrApplication
 "/    ].
     items isEmptyOrNil ifTrue:[^ self].
-    NeedResourcesQuery query ifFalse:[^self].
+    "/ someone might catch queries and return some non-boolean
+    "/ this is a bad side effect of Query being a subclass of Notification!!
+    NeedResourcesQuery query == true ifFalse:[^self].
 
     resolvedItems := OrderedCollection new.
 
@@ -612,7 +612,9 @@
 
             rcv := aResourceContainerOrApplication.
             [rcv notNil and:[resItems isNil]] whileTrue:[
-                resItems := anItem resolveSliceMenuItemsIn:rcv rememberResourcesIn:aValueHolderOrNil.
+                "/ pass down the original app while walking the master chain,
+                "/ so that subclices can be redefined (is that what we want???)
+                resItems := anItem resolveSliceMenuItemsIn:rcv for:aResourceContainerOrApplication rememberResourcesIn:aValueHolderOrNil.
                 rcv := rcv perform:#masterApplication ifNotUnderstood:nil.
             ].
 
@@ -626,7 +628,7 @@
     ].
     items := resolvedItems.
 
-    "Modified: / 22-09-2010 / 13:34:38 / cg"
+    "Modified (comment): / 21-07-2017 / 20:24:26 / cg"
 ! !
 
 !Menu methodsFor:'adding & removing'!