X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=69b63ff1334887c766dac083e0eab748d7824bd4;hb=8470142e00a25553e5a77393b1b4727c0542bc65;hp=91ba190b8824b124a6e0c5f8b60256377fd96b4b;hpb=5722e9e98d880f71729ecabb23ce330643529706;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index 91ba190b..69b63ff1 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -438,7 +438,7 @@ static void event_handle_client(Client *client, XEvent *e)
 	client_unmanage(client);
 	break;
     case MapRequest:
-        if (!client->iconic) break; /* this normal doesn't happen, but if it
+        if (!client->iconic) break; /* this normally doesn't happen, but if it
                                        does, we don't want it! */
         if (screen_showing_desktop)
             screen_show_desktop(FALSE);
@@ -485,7 +485,9 @@ static void event_handle_client(Client *client, XEvent *e)
 		}
 		e->xclient = ce.xclient;
 	    }
-	    client_set_desktop(client, e->xclient.data.l[0]);
+            if (e->xclient.data.l[0] >= 0 &&
+                e->xclient.data.l[0] < screen_num_desktops)
+                client_set_desktop(client, e->xclient.data.l[0]);
 	} else if (msgtype == prop_atoms.net_wm_state) {
 	    /* can't compress these */
 	    g_message("net_wm_state %s %ld %ld for 0x%lx",