pvr: fixed: garbage in returned GroupName due to out-of-scope usage o…

…f a std::string This fixes the channel groups for all pvr addons under Windows. This commit partly reverts the change from 4e72ffe
margro · Aug 12, 2012 · 6445b14 · 6445b14
1 parent ca1b80a
commit 6445b14
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/xbmc/pvr/channels/PVRChannelGroup.cpp b/xbmc/pvr/channels/PVRChannelGroup.cpp
@@ -1086,11 +1086,9 @@ int CPVRChannelGroup::GroupType(void) const
   return m_iGroupType;
 }
 
-CStdString CPVRChannelGroup::GroupName(void) const
+const CStdString& CPVRChannelGroup::GroupName(void) const
 {
-  CSingleLock lock(m_critSection);
-  CStdString strReturn(m_strGroupName);
-  return strReturn;
+  return m_strGroupName;
 }
 
 bool CPVRChannelGroup::UpdateChannel(const CFileItem &item, bool bHidden, bool bVirtual, bool bEPGEnabled, bool bParentalLocked, int iEPGSource, int iChannelNumber, const CStdString &strChannelName, const CStdString &strIconPath, const CStdString &strStreamURL)

diff --git a/xbmc/pvr/channels/PVRChannelGroup.h b/xbmc/pvr/channels/PVRChannelGroup.h
@@ -208,7 +208,7 @@ namespace PVR
      * @brief The name of this group.
      * @return The name of this group.
      */
-    CStdString GroupName(void) const;
+    const CStdString &GroupName(void) const;
 
     /*! @name Sort methods
      */