Merge pull request xbmc#3989 from xhaggi/fix-channel-icon

[pvr] fix: changed thumbnail not instantly applied in channel list (Ticket xbmc#14820)
ScudLee · Jan 21, 2014 · 0b5e6b6 · 0b5e6b6
2 parents c0254bc + abc6253
commit 0b5e6b6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/xbmc/pvr/channels/PVRChannelGroup.h b/xbmc/pvr/channels/PVRChannelGroup.h
@@ -398,6 +398,13 @@ namespace PVR
      */
     CPVRChannelPtr GetByClient(int iUniqueChannelId, int iClientID) const;
 
+    /*!
+     * @brief Get a channel given it's unique ID.
+     * @param iUniqueID The unique ID.
+     * @return The channel or NULL if it wasn't found.
+     */
+    CPVRChannelPtr GetByUniqueID(int iUniqueID) const;
+
     void SetSelectedGroup(bool bSetTo);
     bool IsSelectedGroup(void) const;
 
@@ -487,13 +494,6 @@ namespace PVR
 
     void ResetChannelNumbers(void);
 
-    /*!
-     * @brief Get a channel given it's unique ID.
-     * @param iUniqueID The unique ID.
-     * @return The channel or NULL if it wasn't found.
-     */
-    CPVRChannelPtr GetByUniqueID(int iUniqueID) const;
-
     /*!
      * @brief Get a channel given it's channel ID.
      * @param iChannelID The channel ID.

diff --git a/xbmc/pvr/windows/GUIWindowPVRChannels.cpp b/xbmc/pvr/windows/GUIWindowPVRChannels.cpp
@@ -497,8 +497,11 @@ bool CGUIWindowPVRChannels::OnContextButtonSetThumb(CFileItem *item, CONTEXT_BUT
       if (strThumb == "thumb://None")
         strThumb = "";
 
-      channel->SetIconPath(strThumb, true);
-      channel->Persist();
+      CPVRChannelGroupPtr group = g_PVRChannelGroups->GetGroupAll(channel->IsRadio());
+      CPVRChannelPtr channelPtr = group->GetByUniqueID(channel->UniqueID());
+
+      channelPtr->SetIconPath(strThumb, true);
+      channelPtr->Persist();
       UpdateData();
     }