aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 3b2d11a..0b46c07 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -480,7 +480,7 @@ void FluxboxWindow::init() {
480 int real_y = frame().y(); 480 int real_y = frame().y();
481 481
482 if (real_x >= 0 && 482 if (real_x >= 0 &&
483 real_y + frame().y() >= 0 && 483 real_y >= 0 &&
484 real_x <= (signed) screen().width() && 484 real_x <= (signed) screen().width() &&
485 real_y <= (signed) screen().height()) 485 real_y <= (signed) screen().height())
486 place_window = false; 486 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