#44 fix mightycore compile error, #43 menu iteration does not traverse into submenus that don't match predicate

Author: davetcc

src/BaseRenderers.h

@@ -84,11 +84,11 @@ class TitleWidget {
 #ifdef __AVR__
 	const uint8_t* getCurrentIcon() {
         changed = false;
-        return pgm_read_ptr(&iconData[currentState]);
+        return (const uint8_t *)pgm_read_ptr(&iconData[currentState]);
     }
     const uint8_t* getIcon(int num) {
         if(num >= maxStateIcons) num = 0;
-        return pgm_read_ptr(&iconData[num]);
+        return (const uint8_t *)pgm_read_ptr(&iconData[num]);
     }
 #else
 	const uint8_t* getCurrentIcon() {

src/MenuIterator.cpp

@@ -104,10 +104,10 @@ MenuItem* MenuItemIterator::nextItem() {
                     processingSubMenu = true;
                     return currentItem;
                 }
-                else processingSubMenu = true;
+                else processingSubMenu = predicateMatches;
 
-                // we always follow submenus even if we don't report them. But we sometimes need
-                // to do it in two iterations.
+                // We should most certainly not follow a sub menu that does not match, because it's
+                // highly unlikely to be useful and will probably cause problems in the remote side.
                 if(processingSubMenu) {
                     processingSubMenu = false;
                     parentItems[level++] = currentItem;