Ticket #12620: videodlg.cpp.patch

branches/mythtv_github/devel-fixes-0.27/mythtv/mythtv/programs/mythfrontend/videodlg.cpp

@@ -3571 +3571 @@
     if (!metadata)
         return;
 
-    if (m_d->m_videoList->Delete(metadata->GetID()))
+    unsigned int id = metadata->GetID();
+    if (id == 0)
+    {
+        if (m_d->m_videoList->Delete(metadata->GetFilename()))
+        {
+            if (m_videoButtonTree)
+                m_videoButtonTree->RemoveItem(item, false); // FIXME Segfault when true
+            else
+                m_videoButtonList->RemoveItem(item);
+            MythGenericTree *parent = gtItem->getParent();
+            parent->deleteNode(gtItem);
+            return;
+        }
+    }
+    else if (m_d->m_videoList->Delete(id))
     {
         if (m_videoButtonTree)
             m_videoButtonTree->RemoveItem(item, false); // FIXME Segfault when true
         else
             m_videoButtonList->RemoveItem(item);
-
         MythGenericTree *parent = gtItem->getParent();
         parent->deleteNode(gtItem);
+        return;
     }
-    else
-    {
-        QString message = tr("Failed to delete file");
-
-        MythConfirmationDialog *confirmdialog =
-                        new MythConfirmationDialog(m_popupStack,message,false);
-
-        if (confirmdialog->Create())
-            m_popupStack->AddScreen(confirmdialog);
-    }
+    QString message = tr("Failed to delete file");
+    MythConfirmationDialog *confirmdialog =
+                    new MythConfirmationDialog(m_popupStack,message,false);
+    if (confirmdialog->Create())
+        m_popupStack->AddScreen(confirmdialog);
 }
 
 void VideoDialog::ResetMetadata()