Ticket #6254: PBB_Play_from_dialog.diff

programs/mythfrontend/playbackbox.cpp

@@ -1443 +1443 @@
 void PlaybackBox::playSelected(MythUIButtonListItem *item)
 {
     if (!item)
-        return;
+        item = m_recordingList->GetItemCurrent();
 
-    item = m_recordingList->GetItemCurrent();
-
     if (!item)
         return;
 
@@ -2156 +2154 @@
 
     m_popupMenu = new MythDialogBox(label, m_popupStack, "pbbmainmenupopup");
 
-    if (m_popupMenu)
+    if (!m_popupMenu)
         return;
+
     connect(m_popupMenu, SIGNAL(Exiting()), SLOT(popupClosed()));
 
     if (m_popupMenu->Create())
@@ -2166 +2165 @@
     {
         delete m_popupMenu;
         m_popupMenu = NULL;
+        return;
     }
 
     m_popupMenu->SetReturnEvent(this, "slotmenu");
@@ -2443 +2443 @@
     }
     else
     {
-        if (sameProgram)
-        {
-            if (pginfo->programflags & FL_BOOKMARK)
-                m_popupMenu->AddButton(tr("Play from..."),
-                                            SLOT(showPlayFromPopup()), true);
-            else
-                m_popupMenu->AddButton(tr("Play"), SLOT(playSelected()));
-        }
+        if (pginfo->programflags & FL_BOOKMARK)
+            m_popupMenu->AddButton(tr("Play from..."),
+                                        SLOT(showPlayFromPopup()), true);
+        else
+            m_popupMenu->AddButton(tr("Play"), SLOT(playSelected()));
 
         if (m_playList.filter(pginfo->MakeUniqueKey()).size())
             m_popupMenu->AddButton(tr("Remove from Playlist"),