summaryrefslogtreecommitdiff
path: root/app/cwm/xevents.c
diff options
context:
space:
mode:
Diffstat (limited to 'app/cwm/xevents.c')
-rw-r--r--app/cwm/xevents.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/app/cwm/xevents.c b/app/cwm/xevents.c
index a697e9f28..19f957857 100644
--- a/app/cwm/xevents.c
+++ b/app/cwm/xevents.c
@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $OpenBSD: xevents.c,v 1.136 2019/02/22 19:40:33 okan Exp $
+ * $OpenBSD: xevents.c,v 1.137 2019/02/28 23:26:12 okan Exp $
*/
/*
@@ -408,7 +408,9 @@ xev_handle_clientmessage(XEvent *ee)
if (e->data.l[0] == (unsigned long)-1)
group_movetogroup(cc, 0);
else
- group_movetogroup(cc, e->data.l[0]);
+ if (e->data.l[0] >= 0 &&
+ e->data.l[0] < Conf.ngroups)
+ group_movetogroup(cc, e->data.l[0]);
}
} else if (e->message_type == ewmh[_NET_WM_STATE]) {
if ((cc = client_find(e->window)) != NULL) {
@@ -417,7 +419,9 @@ xev_handle_clientmessage(XEvent *ee)
}
} else if (e->message_type == ewmh[_NET_CURRENT_DESKTOP]) {
if ((sc = screen_find(e->window)) != NULL) {
- group_only(sc, e->data.l[0]);
+ if (e->data.l[0] >= 0 &&
+ e->data.l[0] < Conf.ngroups)
+ group_only(sc, e->data.l[0]);
}
}
}