Ticket #8045: videomenu_display_patch

Index: mythtv/libs/libmythui/mythmainwindow.cpp
===================================================================
--- mythtv/libs/libmythui/mythmainwindow.cpp    (revision 23523)
+++ mythtv/libs/libmythui/mythmainwindow.cpp    (working copy)
@@ -1134,7 +1134,7 @@
             d->exitmenucallback = NULL;
             callback();
         }
-        else if (d->exitmenumediadevicecallback)
+        if (d->exitmenumediadevicecallback)
         {
             void (*callback)(MythMediaDevice*) = d->exitmenumediadevicecallback;
             MythMediaDevice * mediadevice = d->mediadeviceforcallback;
@@ -1450,6 +1450,19 @@
     }
 }
 
+void MythMainWindow::CallMediaDeviceOnJumpTo(const QString &destination, void (*fn)(MythMediaDevice* mediadevice), MythMediaDevice *device)
+{
+    if (DestinationExists(destination))
+    {
+        d->exitmenumediadevicecallback = fn;
+       d->mediadeviceforcallback = device;
+       JumpTo(destination);
+    }  else
+    {
+        fn(device);
+    }
+}
+
 bool MythMainWindow::DestinationExists(const QString& destination) const
 {
     return (d->destinationMap.count(destination) > 0) ? true : false;
Index: mythtv/libs/libmythui/mythmainwindow.h
===================================================================
--- mythtv/libs/libmythui/mythmainwindow.h      (revision 23523)
+++ mythtv/libs/libmythui/mythmainwindow.h      (working copy)
@@ -73,7 +73,9 @@
 
     void JumpTo(const QString &destination, bool pop = true);
     bool DestinationExists(const QString &destination) const;
-
+    void CallMediaDeviceOnJumpTo(const QString &destination,
+                                void (*fn)(MythMediaDevice* mediadevice) ,
+                                MythMediaDevice *);
     bool IsExitingToMain(void) const;
 
     static MythMainWindow *getMainWindow(const bool useDB = true);
Index: mythtv/libs/libmyth/mythmediamonitor.cpp
===================================================================
--- mythtv/libs/libmyth/mythmediamonitor.cpp    (revision 23523)
+++ mythtv/libs/libmyth/mythmediamonitor.cpp    (working copy)
@@ -650,8 +650,7 @@
     int selected = 0;
 
 
-    GetMythMainWindow()->JumpTo("Main Menu");
-    handlers.at(selected).callback(pMedia);
+    GetMythMainWindow()->CallMediaDeviceOnJumpTo("Main Menu",handlers.at(selected).callback, pMedia);
 }
 
 // Signal handler.