- OBClient *client = Openbox::instance->findClient(e.window);
-
- if (client) {
- // XXX: uniconify and/or unshade the window
- } else {
+ /*
+ MapRequest events come here even after the window exists instead of going
+ right to the client window, because of how they are sent and their struct
+ layout.
+ */
+ OBClient *c = Openbox::instance->findClient(e.window);
+
+ if (c) {
+ if (c->shaded())
+ c->shade(false);
+ // XXX: uniconify the window
+ c->focus();
+ } else