From: Mikael Magnusson <mikachu@gmail.com>
Date: Sun, 3 Jun 2012 18:18:48 +0000 (+0200)
Subject: Fix crash on unexpected NET_WM_MOVERESIZE_CANCEL messages
X-Git-Tag: release-3.5.1~102
X-Git-Url: http://git.openbox.org/?p=dana%2Fopenbox.git;a=commitdiff_plain;h=58f666a2a5111a16cbb1b416852e90c4c79f6671;hp=4195eafdb69c62e94146a415671cb2fa34132b6c

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.
---

diff --git a/openbox/event.c b/openbox/event.c
index cf089b6..00b0bff 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;