Merge commit 'v1.1.11.27' into strippedstripped1.1.11.27

Conflicts:
	data/Makefile.am

1 files changed, 8 insertions, 3 deletions

diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 0246a5b62..9aa6bb956 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -599,12 +599,17 @@ std::string Theme::resolveThemePath(const std::string &path)
     else
         file = path;
 
-    // Might be a valid path already
-    if (PHYSFS_exists(file.c_str()))
-        return path;
+    // File with path
+    if (file.find('/') != std::string::npos)
+    {
+        // Might be a valid path already
+        if (PHYSFS_exists(file.c_str()))
+            return path;
+    }
 
     // Try the theme
     file = getThemePath() + "/" + file;
+
     if (PHYSFS_exists(file.c_str()))
         return getThemePath() + "/" + path;