From 622d75f6429ebeb949b13d68c1ca188d7b5c8093 Mon Sep 17 00:00:00 2001
From: markt <markt>
Date: Wed, 18 Apr 2007 18:12:29 +0000
Subject: [PATCH] fix for fbsetbg -l when last wallpaper was using 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 6c7cf111..a6fff7ce 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -472,7 +472,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 718b19ef..6ae66988 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