aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmarshallnz <jmarshallnz@svn>2010-11-18 01:10:36 +0000
committerjmarshallnz <jmarshallnz@svn>2010-11-18 01:10:36 +0000
commit6671cfaae5a7570fcec450e8030273eefee7fe2c (patch)
tree9f382741b03dafef637d5d7fab0addd9e94c89a1
parentdc315fa3fac82239038b729ef3d338cd2615299b (diff)
fixed: multiimage controls with <imagepath> contained in Textures.xbt didn't work unless the directory inside media/ also existed.
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@35315 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
-rw-r--r--guilib/GUIMultiImage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/guilib/GUIMultiImage.cpp b/guilib/GUIMultiImage.cpp
index 1666a54c17..67aaf1cbdb 100644
--- a/guilib/GUIMultiImage.cpp
+++ b/guilib/GUIMultiImage.cpp
@@ -223,7 +223,7 @@ void CGUIMultiImage::LoadDirectory()
// Load in our images from the directory specified
// m_currentPath is relative (as are all skin paths)
CStdString realPath = g_TextureManager.GetTexturePath(m_currentPath, true);
- if (realPath.IsEmpty())
+ if (realPath.IsEmpty() && m_files.empty())
return;
CUtil::AddSlashAtEnd(realPath);