aboutsummaryrefslogtreecommitdiff
path: root/guilib
diff options
context:
space:
mode:
authorjmarshallnz <jmarshallnz@svn>2010-07-22 20:17:59 +0000
committerjmarshallnz <jmarshallnz@svn>2010-07-22 20:17:59 +0000
commit14f818221ce78162267fef0667b2a242ee36fc40 (patch)
tree471c84bdbcf4f2e042d17f3fe0539010eb73a53f /guilib
parentc339bc2a0809af55ad27b19abd9475a2ec53f19a (diff)
fixed: <include> within <animation> tags worked only for the first one.
(cherry picked from commit ab3c1887c9c40400f53a8e3d3aa41872972e8b24) git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@32079 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib')
-rw-r--r--guilib/GUIControlFactory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/guilib/GUIControlFactory.cpp b/guilib/GUIControlFactory.cpp
index cc00d2e41d..3124da65b1 100644
--- a/guilib/GUIControlFactory.cpp
+++ b/guilib/GUIControlFactory.cpp
@@ -416,12 +416,12 @@ bool CGUIControlFactory::GetConditionalVisibility(const TiXmlNode *control, int
bool CGUIControlFactory::GetAnimations(TiXmlNode *control, const CRect &rect, vector<CAnimation> &animations)
{
TiXmlElement* node = control->FirstChildElement("animation");
- g_SkinInfo->ResolveIncludes(node);
bool ret = false;
if (node)
animations.clear();
while (node)
{
+ g_SkinInfo->ResolveIncludes(node);
ret = true;
if (node->FirstChild())
{