From 0aa2c1373944b6d82793b91de744ce81d114474e Mon Sep 17 00:00:00 2001 From: Yohann Ferreira Date: Wed, 19 Jan 2011 01:13:29 +0100 Subject: Fix the wallpapers loading broken logic. Trivial. --- src/resources/wallpaper.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp index 22bbda9c..c8857745 100644 --- a/src/resources/wallpaper.cpp +++ b/src/resources/wallpaper.cpp @@ -55,9 +55,7 @@ static void initDefaultWallpaperPaths() // Init the path wallpaperPath = branding.getValue("wallpapersPath", ""); - if (!wallpaperPath.empty() && resman->isDirectory(wallpaperPath)) - return; - else + if (wallpaperPath.empty() || !resman->isDirectory(wallpaperPath)) wallpaperPath = paths.getValue("wallpapers", ""); if (wallpaperPath.empty() || !resman->isDirectory(wallpaperPath)) @@ -66,12 +64,12 @@ static void initDefaultWallpaperPaths() // Init the default file wallpaperFile = branding.getValue("wallpaperFile", ""); - if (!wallpaperFile.empty() && resman->isDirectory(wallpaperFile)) + if (!wallpaperFile.empty() && !resman->isDirectory(wallpaperFile)) return; else wallpaperFile = paths.getValue("wallpaperFile", ""); - if (wallpaperFile.empty() || !resman->isDirectory(wallpaperFile)) + if (wallpaperFile.empty() || resman->isDirectory(wallpaperFile)) wallpaperFile = "login_wallpaper.png"; } -- cgit v1.2.3-70-g09d2