watch out when unmanaging a window, that it is not being move/resized

1 files changed, 6 insertions, 2 deletions

diff --git a/openbox/client.c b/openbox/client.c
index 4d3010dc..da3a8e32 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1,5 +1,6 @@
 #include "client.h"
 #include "screen.h"
+#include "moveresize.h"
 #include "prop.h"
 #include "extensions.h"
 #include "frame.h"
@@ -237,8 +238,6 @@ void client_manage(Window window)
 
     client_showhide(self);
 
-    dispatch_client(Event_Client_Mapped, self, 0, 0);
-
     /* focus the new window? */
     if (ob_state != State_Starting && client_normal(self)) {
         if (config_focus_new)
@@ -265,6 +264,8 @@ void client_manage(Window window)
     /* make sure the window is visible */
     client_move_onscreen(self);
 
+    dispatch_client(Event_Client_Mapped, self, 0, 0);
+
     g_message("Managed window 0x%lx", window);
 }
 
@@ -331,6 +332,9 @@ void client_unmanage(Client *self)
         }
     }
 
+    if (moveresize_client == self)
+        moveresize_end(TRUE);
+
     if (focus_client == self)
         client_unfocus(self);