diff options
| author | jmarshallnz <jmarshallnz@svn> | 2010-02-14 08:14:08 +0000 |
|---|---|---|
| committer | jmarshallnz <jmarshallnz@svn> | 2010-02-14 08:14:08 +0000 |
| commit | 382e68e8366adccedae8ca105300e3b608c49c71 (patch) | |
| tree | 2be861c3642d77e92393de45576be40e70e731b7 /guilib | |
| parent | badf469d73ec083ef05e4909fcbc0e7644ac4e22 (diff) | |
fixed: labels in static containers were returning image values (sidenote: image and label info needs unifying, this stuff will be broken elsewhere otherwise)
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@27758 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib')
| -rw-r--r-- | guilib/GUIStaticItem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guilib/GUIStaticItem.cpp b/guilib/GUIStaticItem.cpp index ea6492f385..27066759bf 100644 --- a/guilib/GUIStaticItem.cpp +++ b/guilib/GUIStaticItem.cpp @@ -103,9 +103,9 @@ void CGUIStaticItem::UpdateProperties(int contextWindow) { if (i->first.Left(5).Equals("info:")) { - // prefer images in general - CStdString info(CGUIInfoLabel::GetLabel(i->second, contextWindow, true)); + // prefer images if it's not label or label2 CStdString prop(i->first.Mid(5)); + CStdString info(CGUIInfoLabel::GetLabel(i->second, contextWindow, !prop.Left(5).Equals("label"))); if (prop.Equals("label")) SetLabel(info); else if (prop.Equals("label2")) |