aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorJim Ramsay <i.am@jimramsay.com>2009-04-24 18:15:58 (GMT)
committerJim Ramsay <i.am@jimramsay.com>2009-05-26 20:36:43 (GMT)
commitae2d4b6b53757597f96d34f0266de8d5ec190f94 (patch)
tree5abc08dfbca1fe27d8692f4810e752093388053a /util
parentedffe9c93f051e863f9fb9c768a837534c2e567f (diff)
downloadfluxbox_pavel-ae2d4b6b53757597f96d34f0266de8d5ec190f94.zip
fluxbox_pavel-ae2d4b6b53757597f96d34f0266de8d5ec190f94.tar.bz2
Don't complain on '-z' if there's no lastwallpaper
This hides the odd cornercase of users with no lastwallpaper file and no background set in their style or overlay. Adapted from the patch at http://sourceforge.net/tracker/?func=detail&aid=2389567&group_id=35398&atid=413962
Diffstat (limited to 'util')
-rw-r--r--util/fbsetbg4
1 files changed, 4 insertions, 0 deletions
diff --git a/util/fbsetbg b/util/fbsetbg
index a12d427..47aa33b 100644
--- a/util/fbsetbg
+++ b/util/fbsetbg
@@ -308,6 +308,7 @@ while [ $# -gt 0 ]; do
308 remember=false 308 remember=false
309 break 309 break
310 fi 310 fi
311 ignore_missing_wallpaper=true
311 style="style" 312 style="style"
312 shift ;; 313 shift ;;
313 -Z) 314 -Z)
@@ -521,6 +522,9 @@ fi
521 522
522 523
523if [ ! -r "$wallpaper" ]; then 524if [ ! -r "$wallpaper" ]; then
525 if [ "$ignore_missing_wallpaper" == "true" ]; then
526 exit 0
527 fi
524 message "Can't find wallpaper $wallpaper" 528 message "Can't find wallpaper $wallpaper"
525 exit 1 529 exit 1
526fi 530fi