Ticket #9615: mainmenu_jumppoint_reset.patch

mythtv/libs/libmythui/mythmainwindow.cpp

@@ -71 +71 @@
 #include "mythgesture.h"
 #include "mythuihelper.h"
 #include "mythdialogbox.h"
+#include "myththemedmenu.h"
 
 #ifdef USING_VDPAU
 #include "mythpainter_vdpau.h"
@@ -1486 +1487 @@
         d->exitmenucallback = d->jumpMap[keynum]->callback;
         QCoreApplication::postEvent(
             this, new QEvent(MythEvent::kExitToMainMenuEventType));
+
+        // This code has the effect of resetting the selected button
+        // to the first item when executing the "Main Menu" jump point
+        // from the top-level main menu.
+        MythThemedMenuState *menu = dynamic_cast<MythThemedMenuState *>
+            (GetMainStack()->GetTopScreen());
+        if (menu)
+            menu->m_buttonList->SetItemCurrent(0);
+
         return true;
     }