X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fclient.cc;h=026f4f2f8bd6b7aad78f12ded2fda0c7a52dab0b;hb=889df8a74da733c849cb52c3a76ae59956755882;hp=70673c50ce53ab1884ed88db2cbd3bbc34fab1dd;hpb=7ca4d1cf8a1fd3b414219c77a57fff7d333f5e7f;p=chaz%2Fopenbox

diff --git a/src/client.cc b/src/client.cc
index 70673c50..026f4f2f 100644
--- a/src/client.cc
+++ b/src/client.cc
@@ -997,7 +997,8 @@ void OBClient::move(int x, int y)
   _area.setPos(x, y);
 
   // move the frame to be in the requested position
-  frame->adjustPosition();
+  if (frame) // this can be called while mapping, before frame exists
+    frame->adjustPosition();
 }
 
 
@@ -1218,15 +1219,18 @@ void OBClient::configureRequestHandler(const XConfigureRequestEvent &e)
 
 void OBClient::unmapHandler(const XUnmapEvent &e)
 {
+  if (ignore_unmaps) {
 #ifdef    DEBUG
-  printf("UnmapNotify for 0x%lx\n", e.window);
+    printf("Ignored UnmapNotify for 0x%lx (event 0x%lx)\n", e.window, e.event);
 #endif // DEBUG
-
-  if (ignore_unmaps) {
     ignore_unmaps--;
     return;
   }
   
+#ifdef    DEBUG
+  printf("UnmapNotify for 0x%lx\n", e.window);
+#endif // DEBUG
+
   OtkEventHandler::unmapHandler(e);
 
   // this deletes us etc
@@ -1266,7 +1270,7 @@ void OBClient::reparentHandler(const XReparentEvent &e)
   */
 
   // this deletes us etc
-  Openbox::instance->screen(_screen)->unmanageWindow(this);
+  Openbox::instance->screen(_screen)->unmanageWindow(this, true);
 }
 
 }