Ticket #1894: guideicons.patch

libs/libmythtv/guidegrid.cpp

@@ -1135 +1135 @@
         if ((y == (unsigned int)2 && scrolltype != 1) || 
             ((signed int)y == m_currentRow && scrolltype == 1))
         {
-            if (chinfo->iconpath != "none" && chinfo->iconpath != "")
+            if (!chinfo->iconpath.isEmpty() && chinfo->iconpath != "none")
             {
                 int iconsize = 0;
                 if (itype)
@@ -1144 +1144 @@
                     iconsize = type->GetSize();
                 if (!chinfo->iconload)
                     chinfo->LoadIcon(iconsize);
-                if (chinfo->iconload && itype)
-                    itype->SetImage(chinfo->icon);
+                if (chinfo->iconload)
+                {
+                    if (itype)
+                        itype->SetImage(chinfo->icon);
+                }
+                else
+                {
+                    chinfo->iconpath = QString::null;
+                }
             }
         }
 
@@ -1166 +1173 @@
                     chinfo->LoadIcon(iconsize);
                 if (chinfo->iconload)
                     type->SetIcon(y, chinfo->icon);
+                else
+                {
+                    chinfo->iconpath = QString::null;
+                    type->ResetImage(y);
+                }
             }
             else
             {
@@ -1271 +1283 @@
         container->ClearAllText();
         container->SetText(infoMap);
 
-        UITextType *type;
-
-        type = (UITextType *)container->GetType("misicon");
-        if (type)
-            type->SetText(chinfo->callsign);
-
         UIImageType *itype = (UIImageType *)container->GetType("icon");
         if (itype)
         {
@@ -1284 +1290 @@
             itype->LoadImage();
         }
 
+        if (!itype || chinfo->iconpath.isEmpty() || chinfo->iconpath == "none")
+        {
+            UITextType *type = (UITextType *)container->GetType("misicon");
+            if (type)
+                type->SetText(chinfo->callsign);
+        }
+
         container->Draw(&tmp, 1, m_context);
         container->Draw(&tmp, 2, m_context);
         container->Draw(&tmp, 3, m_context);