From 389253b4c65dd2120bf4806f57123e623b3b0383 Mon Sep 17 00:00:00 2001 From: Paul Cercueil Date: Tue, 4 Dec 2012 14:21:22 -0300 Subject: [PATCH] Load the skin's wallpaper if the default one is not yet defined --- src/gmenu2x.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/gmenu2x.cpp b/src/gmenu2x.cpp index 0f1f719..7d4db05 100644 --- a/src/gmenu2x.cpp +++ b/src/gmenu2x.cpp @@ -277,7 +277,7 @@ GMenu2X::GMenu2X() bg = NULL; font = NULL; menu = NULL; - setSkin(confStr["skin"], false); + setSkin(confStr["skin"], !fileExists(confStr["wallpaper"])); initMenu(); if (!fileExists(confStr["wallpaper"])) { @@ -976,8 +976,13 @@ void GMenu2X::setSkin(const string &skin, bool setWallpaper) { } skinconf.close(); - if (setWallpaper && !skinConfStr["wallpaper"].empty() && fileExists("skins/"+skin+"/wallpapers/"+skinConfStr["wallpaper"])) - confStr["wallpaper"] = "skins/"+skin+"/wallpapers/"+skinConfStr["wallpaper"]; + if (setWallpaper && !skinConfStr["wallpaper"].empty()) { + string fp = sc.getSkinFilePath("wallpapers/" + skinConfStr["wallpaper"]); + if (!fp.empty()) + confStr["wallpaper"] = fp; + else + WARNING("Unable to find wallpaper defined on skin %s\n", skin.c_str()); + } } }