Anonymous

Index: mythtv/libs/libmythtv/osd.cpp
===================================================================
--- mythtv/libs/libmythtv/osd.cpp       (revision 13308)
+++ mythtv/libs/libmythtv/osd.cpp       (working copy)
@@ -26,6 +26,7 @@
 #include "textsubtitleparser.h"
 #include "libmyth/oldsettings.h"
 #include "udpnotify.h"
+#include "infostructs.h"

 #include "osdtypeteletext.h"
 #include "osdlistbtntype.h"
@@ -1626,7 +1627,18 @@
         if (cs)
         {
             if ((infoMap.contains("iconpath")) && (infoMap["iconpath"] != ""))
-                cs->LoadImage(infoMap["iconpath"], wmult, hmult, 30, 30);
+            {
+                ChannelInfo chinfo;
+                chinfo.iconpath = infoMap["iconpath"];
+                chinfo.LoadIcon(60);
+
+                if (chinfo.iconload)
+                {
+                    cs->LoadFromQImage(chinfo.icon.convertToImage());
+                }
+                else
+                    cs->LoadImage(" ", wmult, hmult, 30, 30);
+            }
             else
                 cs->LoadImage(" ", wmult, hmult, 30, 30);
         }