Merge pull request #1778 from Airblader/bug-1777

Send custom command if workspace buttons are disabled
This commit is contained in:
Michael Stapelberg 2015-07-01 06:05:56 -07:00
commit b30d87ea81
1 changed files with 4 additions and 5 deletions

View File

@ -460,11 +460,6 @@ void handle_button(xcb_button_press_event_t *event) {
x = original_x; x = original_x;
} }
if (cur_ws == NULL) {
DLOG("No workspace active?\n");
return;
}
/* If a custom command was specified for this mouse button, it overrides /* If a custom command was specified for this mouse button, it overrides
* the default behavior. */ * the default behavior. */
binding_t *binding; binding_t *binding;
@ -476,6 +471,10 @@ void handle_button(xcb_button_press_event_t *event) {
return; return;
} }
if (cur_ws == NULL) {
DLOG("No workspace active?\n");
return;
}
switch (event->detail) { switch (event->detail) {
case 4: case 4:
/* Mouse wheel up. We select the previous ws, if any. /* Mouse wheel up. We select the previous ws, if any.