diff options
| author | jmarshallnz <jmarshallnz@svn> | 2010-07-18 08:34:57 +0000 |
|---|---|---|
| committer | jmarshallnz <jmarshallnz@svn> | 2010-07-18 08:34:57 +0000 |
| commit | 4c6cf6cd8b7e17f45980cdfeec77485f4dc5ef0d (patch) | |
| tree | 0181a11fd4c3c871d23284dd874f82aa7388c83c /guilib/GUIControlFactory.cpp | |
| parent | 0d7579cfe8ec72012557db6cfa32e29e0c956c14 (diff) | |
fixed: includes were not resolved inside <animation> blocks
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@31945 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib/GUIControlFactory.cpp')
| -rw-r--r-- | guilib/GUIControlFactory.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/guilib/GUIControlFactory.cpp b/guilib/GUIControlFactory.cpp index 8920311b48..cc00d2e41d 100644 --- a/guilib/GUIControlFactory.cpp +++ b/guilib/GUIControlFactory.cpp @@ -413,9 +413,10 @@ bool CGUIControlFactory::GetConditionalVisibility(const TiXmlNode *control, int return GetConditionalVisibility(control, condition, allowHiddenFocus); } -bool CGUIControlFactory::GetAnimations(const TiXmlNode *control, const CRect &rect, vector<CAnimation> &animations) +bool CGUIControlFactory::GetAnimations(TiXmlNode *control, const CRect &rect, vector<CAnimation> &animations) { - const TiXmlElement* node = control->FirstChildElement("animation"); + TiXmlElement* node = control->FirstChildElement("animation"); + g_SkinInfo->ResolveIncludes(node); bool ret = false; if (node) animations.clear(); |