From 762c858a15648ce2bb40b3cd913392f570096423 Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 18 Apr 2007 18:11:09 +0000 Subject: fbsetbg -l didn't work properly when previous wallpaper was from fbsetroot --- src/Window.cc | 2 +- util/fbsetbg | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Window.cc b/src/Window.cc index 3b2d11a..0b46c07 100644 --- a/src/Window.cc +++ b/src/Window.cc @@ -480,7 +480,7 @@ void FluxboxWindow::init() { int real_y = frame().y(); if (real_x >= 0 && - real_y + frame().y() >= 0 && + real_y >= 0 && real_x <= (signed) screen().width() && real_y <= (signed) screen().height()) place_window = false; diff --git a/util/fbsetbg b/util/fbsetbg index 718b19e..6ae6698 100644 --- a/util/fbsetbg +++ b/util/fbsetbg @@ -306,6 +306,9 @@ while [ $# -gt 0 ]; do message "No previous wallpaper recorded for display ${DISPLAY}" exit 1 fi + if [ "$option" = "fbsetroot" ]; then + use_fbsetroot + fi else message "No previous wallpaper recorded for display ${DISPLAY}" exit 1 -- cgit v0.11.2