dont grab client context stuff on desktop windows. check that clint is non-null

diff --git a/openbox/mouse.c b/openbox/mouse.c
index 93d00784fb7232638f616795d8f7c1ce4c876dfc..82b124af4e4706a2cf02b9a3e256ee7723d94e16 100644 (file)
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -17,9 +17,9 @@ typedef struct {
     GSList *actions[OB_MOUSE_NUM_ACTIONS]; /* lists of Action pointers */
 } ObMouseBinding;
 
-#define CLIENT_CONTEXT(co, cl) (co == OB_FRAME_CONTEXT_CLIENT || \
-                                (co == OB_FRAME_CONTEXT_ROOT && \
-                                 cl->type == OB_CLIENT_TYPE_DESKTOP))
+#define CLIENT_CONTEXT(co, cl) ((cl && cl->type == OB_CLIENT_TYPE_DESKTOP) ? \
+                                co == OB_FRAME_CONTEXT_ROOT : \
+                                co == OB_FRAME_CONTEXT_CLIENT)
 
 /* Array of GSList*s of PointerBinding*s. */
 static GSList *bound_contexts[OB_FRAME_NUM_CONTEXTS];