gracefully handle grabs failing when doing interactive actions

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index 9f11535241fbb775a99517e896fe5a7313368cc2..05024e72a9a59eaffc83debe8ef1461ebab86654 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -321,6 +321,8 @@ static void event_client_dest(ObClient *client, gpointer data)
         focus_in = NULL;
     if (client == focus_out)
         focus_out = NULL;
+    if (client == focus_hilite)
+        focus_hilite = NULL;
 }
 
 static void event_done(gpointer data)
@@ -829,7 +831,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
         ob_debug("MapRequest for 0x%lx\n", client->window);
         if (!client->iconic) break; /* this normally doesn't happen, but if it
                                        does, we don't want it! */
-        client_activate(client, TRUE);
+        client_activate(client, FALSE);
         break;
     case ClientMessage:
         /* validate cuz we query stuff off the client here */