fix m_iInfoCode in CGUIProgressControl

margro · Jul 31, 2011 · cd04d6e · cd04d6e
1 parent f4d964c
commit cd04d6e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/xbmc/guilib/GUIControlFactory.cpp b/xbmc/guilib/GUIControlFactory.cpp
@@ -1234,10 +1234,12 @@ CGUIControl* CGUIControlFactory::Create(int parentID, const CRect &rect, TiXmlEl
       textureBackground, textureLeft, textureMid, textureRight,
       textureOverlay, bReveal);
 
-    CGUIInfoLabel progress;
-    GetInfoLabel(pControlNode, "progress", progress);
-    if (!progress.IsEmpty())
+    if (XMLUtils::HasChild(pControlNode, "progress"))
+    {
+      CGUIInfoLabel progress;
+      GetInfoLabel(pControlNode, "progress", progress);
       ((CGUIProgressControl *)control)->SetListInfo(progress);
+    }
     else
       ((CGUIProgressControl *)control)->SetInfo(singleInfo);
   }

diff --git a/xbmc/utils/XMLUtils.cpp b/xbmc/utils/XMLUtils.cpp
@@ -132,6 +132,14 @@ bool XMLUtils::GetString(const TiXmlNode* pRootNode, const char* strTag, CStdStr
   return false;
 }
 
+bool XMLUtils::HasChild(const TiXmlNode* pRootNode, const char* strTag)
+{
+  const TiXmlElement* pElement = pRootNode->FirstChildElement(strTag);
+  if (!pElement) return false;
+  const TiXmlNode* pNode = pElement->FirstChild();
+  return (pNode != NULL);
+}
+
 bool XMLUtils::GetAdditiveString(const TiXmlNode* pRootNode, const char* strTag,
                                  const CStdString& strSeparator, CStdString& strStringValue)
 {

diff --git a/xbmc/utils/XMLUtils.h b/xbmc/utils/XMLUtils.h
@@ -29,6 +29,7 @@ class XMLUtils
 {
 public:
   static bool HasUTF8Declaration(const CStdString &strXML);
+  static bool HasChild(const TiXmlNode* pRootNode, const char* strTag);
 
   static bool GetHex(const TiXmlNode* pRootNode, const char* strTag, uint32_t& dwHexValue);
   static bool GetUInt(const TiXmlNode* pRootNode, const char* strTag, uint32_t& dwUIntValue);