fix crash from changing toolbar visibility, some cleanup, and porting change from trunk

1 files changed, 5 insertions, 1 deletions

diff --git a/src/Window.cc b/src/Window.cc
index b9ef2ff..a5cf6fd 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2605,10 +2605,14 @@ void FluxboxWindow::buttonPressEvent(XButtonEvent &be) {
 
 void FluxboxWindow::buttonReleaseEvent(XButtonEvent &re) {
 
-    if ((re.button == 1) && (re.state & Mod1Mask) && !screen().clickRaises())
+    if ((re.button == 1) && (re.state & Fluxbox::instance()->getModKey())
+         && !screen().clickRaises()) {
+
         if (!isMoving())
             raise();
 
+    }
+
     if (isMoving())
         stopMoving();
     else if (isResizing())