Ticket #11865: channelIconsSG.patch.1

diff --git a/mythtv/programs/mythbackend/services/guide.cpp b/mythtv/programs/mythbackend/services/guide.cpp
index 9132243..fd214a8 100644
--- a/mythtv/programs/mythbackend/services/guide.cpp
+++ b/mythtv/programs/mythbackend/services/guide.cpp
@@ -33,6 +33,8 @@
 #include "scheduler.h"
 #include "autoexpire.h"
 #include "channelutil.h"
+#include "mythcorecontext.h"
+#include "storagegroup.h"
 
 extern AutoExpire  *expirer;
 extern Scheduler   *sched;
@@ -225,9 +227,34 @@ QFileInfo Guide::GetChannelIcon( int nChanId,
     // Get Icon file path
 
     QString sFileName = ChannelUtil::GetIcon( nChanId );
+    QString sChannelIconsDir;
+    StorageGroup sg;
 
-    if (sFileName.isEmpty())
+    if (sFileName.isEmpty() || !QFileInfo( sFileName ).isReadable() )
+    {
+        LOG( VB_UPNP, LOG_DEBUG, QString( "chanid '%1' has no readable icon" )
+            .arg( nChanId ) );
         return QFileInfo();
+    }
+
+    if ( !sFileName.startsWith( "/" ) )
+    {
+
+        sg.Init( "ChannelIcons", gCoreContext->GetHostName(), false );
+
+        sChannelIconsDir = sg.GetFirstDir();
+
+        if ( sChannelIconsDir.isEmpty() )
+        {
+            LOG( VB_UPNP, LOG_DEBUG,
+                QString( "No 'ChannelIcons' Storage Group (icon '%1')" )
+                    .arg( sFileName ) );
+            return QFileInfo();
+        }
+
+        sFileName = QString( "%1/%2" ).arg(sChannelIconsDir).arg(sFileName);
+
+    }
 
     if ((nWidth <= 0) && (nHeight <= 0))
     {
@@ -277,7 +304,12 @@ QFileInfo Guide::GetChannelIcon( int nChanId,
     QImage img = pImage->scaled( nWidth, nHeight, Qt::IgnoreAspectRatio,
                                 Qt::SmoothTransformation);
 
-    img.save( sNewFileName, "PNG" );
+    if ( !img.save( sNewFileName, "PNG" ) )
+    {
+        LOG( VB_UPNP, LOG_DEBUG,
+            QString( "Can't save channel icon: '%1'" ).arg( sNewFileName ) );
+        return QFileInfo();
+    }
 
     delete pImage;