[pvr] fixed CPVRChannelGroup::SearchAndSetChannelIcons() after fef3f3a

mikrohard · Oct 28, 2012 · 08e58ee · 08e58ee
1 parent 407596c
commit 08e58ee
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 9 deletions.
diff --git a/xbmc/pvr/channels/PVRChannelGroup.cpp b/xbmc/pvr/channels/PVRChannelGroup.cpp
@@ -211,6 +211,16 @@ bool CPVRChannelGroup::MoveChannel(unsigned int iOldChannelNumber, unsigned int
   return true;
 }
 
+bool CPVRChannelGroup::SetChannelIconPath(CPVRChannelPtr channel, const std::string& strIconPath)
+{
+  if (CFile::Exists(strIconPath))
+  {
+    channel->SetIconPath(strIconPath);
+    return true;
+  }
+  return false;
+}
+
 void CPVRChannelGroup::SearchAndSetChannelIcons(bool bUpdateDb /* = false */)
 {
   if (g_guiSettings.GetString("pvrmenu.iconpath").IsEmpty())
@@ -239,17 +249,17 @@ void CPVRChannelGroup::SearchAndSetChannelIcons(bool bUpdateDb /* = false */)
     strIconPathUid.Format("%08d", groupMember.channel->UniqueID());
     strIconPathUid = URIUtils::AddFileToFolder(strBasePath, strIconPathUid);
 
-    groupMember.channel->SetIconPath(strIconPath      + ".tbn") ||
-    groupMember.channel->SetIconPath(strIconPath      + ".jpg") ||
-    groupMember.channel->SetIconPath(strIconPath      + ".png") ||
+    SetChannelIconPath(groupMember.channel, strIconPath      + ".tbn") ||
+    SetChannelIconPath(groupMember.channel, strIconPath      + ".jpg") ||
+    SetChannelIconPath(groupMember.channel, strIconPath      + ".png") ||
 
-    groupMember.channel->SetIconPath(strIconPathLower + ".tbn") ||
-    groupMember.channel->SetIconPath(strIconPathLower + ".jpg") ||
-    groupMember.channel->SetIconPath(strIconPathLower + ".png") ||
+    SetChannelIconPath(groupMember.channel, strIconPathLower + ".tbn") ||
+    SetChannelIconPath(groupMember.channel, strIconPathLower + ".jpg") ||
+    SetChannelIconPath(groupMember.channel, strIconPathLower + ".png") ||
 
-    groupMember.channel->SetIconPath(strIconPathUid   + ".tbn") ||
-    groupMember.channel->SetIconPath(strIconPathUid   + ".jpg") ||
-    groupMember.channel->SetIconPath(strIconPathUid   + ".png");
+    SetChannelIconPath(groupMember.channel, strIconPathUid   + ".tbn") ||
+    SetChannelIconPath(groupMember.channel, strIconPathUid   + ".jpg") ||
+    SetChannelIconPath(groupMember.channel, strIconPathUid   + ".png");
 
     if (bUpdateDb)
       groupMember.channel->Persist();

diff --git a/xbmc/pvr/channels/PVRChannelGroup.h b/xbmc/pvr/channels/PVRChannelGroup.h
@@ -369,6 +369,14 @@ namespace PVR
     CPVRChannelPtr GetByClient(int iUniqueChannelId, int iClientID) const;
 
   protected:
+    /*!
+     * @brief Set a new channel icon path if the path exists
+     * @param channel The channel to change
+     * @param strIconPath The new path
+     * @return True if the path exists, false otherwise
+     */
+    bool SetChannelIconPath(CPVRChannelPtr channel, const std::string& strIconPath);
+
     /*!
      * @brief Load the channels stored in the database.
      * @param bCompress If true, compress the database after storing the channels.