Ticket #5930: mythgallery.diff

mythplugins/mythgallery/mythgallery/iconview.cpp

@@ -881 +881 @@
 {
     ThumbItem *thumbitem = GetCurrentThumb();
 
+    if (!thumbitem)
+        return;
+    
     QString title = tr("Delete Current File or Folder");
     QString msg = (thumbitem->IsDir()) ?
         tr("Deleting 1 folder, including any subfolders and files.") :
@@ -894 +897 @@
     if (doDelete)
     {
         ThumbItem *thumbitem = GetCurrentThumb();
+        
+        if (!thumbitem)
+            return;
+            
         QFileInfo fi;
         fi.setFile(thumbitem->GetPath());
         GalleryUtil::Delete(fi);
@@ -1316 +1323 @@
 ThumbItem *IconView::GetCurrentThumb(void)
 {
     MythUIButtonListItem *item = m_imageList->GetItemCurrent();
-    return qVariantValue<ThumbItem *>(item->GetData());
+    if (item)
+        return qVariantValue<ThumbItem *>(item->GetData());
+    return NULL;
 }