aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-04-18 18:12:29 (GMT)
committermarkt <markt>2007-04-18 18:12:29 (GMT)
commit622d75f6429ebeb949b13d68c1ca188d7b5c8093 (patch)
treee71bdcd24b855890cfa5dc91e5121da1f0580aac
parent6ac57655d9b0cf02d449aa9a01c7a82f5f3bbffa (diff)
downloadfluxbox_pavel-622d75f6429ebeb949b13d68c1ca188d7b5c8093.zip
fluxbox_pavel-622d75f6429ebeb949b13d68c1ca188d7b5c8093.tar.bz2
fix for fbsetbg -l when last wallpaper was using fbsetroot
-rw-r--r--src/Window.cc2
-rw-r--r--util/fbsetbg3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 6c7cf11..a6fff7c 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -472,7 +472,7 @@ void FluxboxWindow::init() {
472 int real_y = frame().y(); 472 int real_y = frame().y();
473 473
474 if (real_x >= 0 && 474 if (real_x >= 0 &&
475 real_y + frame().y() >= 0 && 475 real_y >= 0 &&
476 real_x <= (signed) screen().width() && 476 real_x <= (signed) screen().width() &&
477 real_y <= (signed) screen().height()) 477 real_y <= (signed) screen().height())
478 place_window = false; 478 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
306 message "No previous wallpaper recorded for display ${DISPLAY}" 306 message "No previous wallpaper recorded for display ${DISPLAY}"
307 exit 1 307 exit 1
308 fi 308 fi
309 if [ "$option" = "fbsetroot" ]; then
310 use_fbsetroot
311 fi
309 else 312 else
310 message "No previous wallpaper recorded for display ${DISPLAY}" 313 message "No previous wallpaper recorded for display ${DISPLAY}"
311 exit 1 314 exit 1