Ticket #7091: videodlg.diff

mythvideo/mythvideo/videodlg.cpp

@@ -3088 +3088 @@
 }
 
 /** \fn VideoDialog::GetFirstImage(MythGenericTree *node, QString type)
- *  \brief Find the first image of "type" within a folder.
+ *  \brief Find the first image of "type" within a folder structure.
  *  \return QString local or myth:// for the image.
+ *
+ *  Will try immediate children (files) first, if no hits, will continue
+ *  through subfolders recursively until an image of the specified type
+ *  is found.
  */
 QString VideoDialog::GetFirstImage(MythGenericTree *node, QString type)
 {
@@ -3098 +3102 @@
     int list_count = node->visibleChildCount();
     if (list_count > 0)
     {
+        QList<MythGenericTree *> subDirs;
+        
         for (int i = 0; i < list_count; i++)
         {
             MythGenericTree *subnode = node->getVisibleChildAt(i);
             if (subnode)
             {
+                if (subnode->childCount() > 0)
+                {
+                    subDirs << subnode;
+                }
+                
                 Metadata *metadata = GetMetadataPtrFromNode(subnode);
                 if (metadata)
                 {
@@ -3199 +3210 @@
                 }
             }
         }
+        if (icon_file.isEmpty() && !subDirs.isEmpty())
+        {
+            QString test_file;
+            int subDirCount = subDirs.count();
+            for (int i = 0; i < subDirCount; i ++)
+            {
+                test_file = GetFirstImage(subDirs[i], type);
+                if (!test_file.isEmpty())
+                {
+                    icon_file = test_file;
+                    break;
+                }
+            }
+        }
     }
     return icon_file;
 }