Merge pull request #2096 from psychon/iconic_state_across_restart

client.c: Set WM_STATE_NORMAL before checking _NET_WM_STATE

objects/client.c

@@ -1498,15 +1498,15 @@ client_manage(xcb_window_t w, xcb_get_geometry_reply_t *wgeom, xcb_get_window_at
         if ((*oc)->transient_for_window == w)
             client_find_transient_for(*oc);
 
+    /* Put the window in normal state. */
+    xwindow_set_state(c->window, XCB_ICCCM_WM_STATE_NORMAL);
+
     /* Then check clients hints */
     ewmh_client_check_hints(c);
 
     /* Push client in stack */
     stack_client_push(c);
 
-    /* Put the window in normal state. */
-    xwindow_set_state(c->window, XCB_ICCCM_WM_STATE_NORMAL);
-
     /* Request our response */
     xcb_get_property_reply_t *reply =
         xcb_get_property_reply(globalconf.connection, startup_id_q, NULL);