summaryrefslogtreecommitdiff
path: root/openbox/event.c
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@gmail.com>2012-06-03 20:18:48 +0200
committerDana Jansens <danakj@orodu.net>2012-09-30 14:38:58 -0400
commit58f666a2a5111a16cbb1b416852e90c4c79f6671 (patch)
tree846abbae8c17793cfb7bfc55de5821e5e97a9a74 /openbox/event.c
parent4195eafdb69c62e94146a415671cb2fa34132b6c (diff)
Fix crash on unexpected NET_WM_MOVERESIZE_CANCEL messages
gtk+ 3.4 apparently sends these randomly when you select text in a GtkEntry. This also fixes bug #5460.
Diffstat (limited to 'openbox/event.c')
-rw-r--r--openbox/event.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/openbox/event.c b/openbox/event.c
index cf089b64..00b0bfff 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1495,7 +1495,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
}
else if ((Atom)e->xclient.data.l[2] ==
OBT_PROP_ATOM(NET_WM_MOVERESIZE_CANCEL))
- moveresize_end(TRUE);
+ if (moveresize_client)
+ moveresize_end(TRUE);
} else if (msgtype == OBT_PROP_ATOM(NET_MOVERESIZE_WINDOW)) {
gint ograv, x, y, w, h;