make ob_exit() take an error code. don't exit with 0 for signals other than TERM...

[chaz/openbox] / openbox / moveresize.c

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 8df3a0806c22e78107ab5ad83992c7613e8a2ada..6a0e97776514c67d9badf16242413af2e864f217 100644 (file)
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -44,8 +44,11 @@ void moveresize_startup(gboolean reconfig)
 
 void moveresize_shutdown(gboolean reconfig)
 {
-    if (!reconfig)
+    if (!reconfig) {
+        if (moveresize_in_progress)
+            moveresize_end(FALSE);
         client_remove_destructor(client_dest);
+    }
 
     popup_free(popup);
     popup = NULL;
@@ -69,9 +72,7 @@ void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr)
 {
     ObCursor cur;
 
-    g_assert(!moveresize_in_progress);
-
-    if (!c->frame->visible)
+    if (moveresize_in_progress || !c->frame->visible)
         return;
 
     moveresize_client = c;