1
0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-05 13:21:54 +02:00

Also search the Default skin in the user directory for skin files

This fixes a segmentation fault occuring on the wallpaper dialog
when trying to select a wallpaper located in the Default skin in
the user directory, when the current skin is not "Default".
This commit is contained in:
Paul Cercueil 2013-08-28 11:32:23 -04:00
parent 965340a39c
commit 3ff6dc93f2

View File

@ -73,9 +73,12 @@ string SurfaceCollection::getSkinFilePath(const string &skin, const string &file
return path; return path;
/* If it is nowhere to be found, as a last resort we check the /* If it is nowhere to be found, as a last resort we check the
* "Default" skin on the system directory for a corresponding * "Default" skin for a corresponding (but probably not similar) file. */
* (but probably not similar) file. */
if (useDefault) { if (useDefault) {
path = GMenu2X::getHome() + "/skins/Default/" + file;
if (fileExists(path))
return path;
path = GMENU2X_SYSTEM_DIR "/skins/Default/" + file; path = GMENU2X_SYSTEM_DIR "/skins/Default/" + file;
if (fileExists(path)) if (fileExists(path))
return path; return path;