From 11e58c8ca56959aed929e0c6f95bc68e0b8eb8ad Mon Sep 17 00:00:00 2001 From: Ayla Date: Mon, 11 Jul 2011 18:14:27 +0200 Subject: [PATCH] Revert "GMenu2X now won't load skin files from the Default skin when using another skin." This reverts commit 439d25c292e62135f4730d0ba053793f7243f631. Refusing to load files of the Default skin for a different one is a bad idea; it requires that skin to provide every single PNG file needed by gmenu2x. --- src/surfacecollection.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/surfacecollection.cpp b/src/surfacecollection.cpp index 3ebc61b..974dda2 100644 --- a/src/surfacecollection.cpp +++ b/src/surfacecollection.cpp @@ -72,6 +72,13 @@ string SurfaceCollection::getSkinFilePath(const string &skin, const string &file if (fileExists(path)) return path; + /* If it is nowhere to be found, as a last resort we check the + * "Default" skin on the system directory for a corresponding + * (but probably not similar) file. */ + path = GMENU2X_SYSTEM_DIR "/skins/Default/" + file; + if (fileExists(path)) + return path; + return ""; }