X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmoveresize.c;h=447869aa29435a56399042cc501f49ba6b7a3430;hb=46d99fbaff396d7b596ece772a6349753c11a135;hp=1c31a2532d210686dc8eba4a190c1453e24bba85;hpb=3541c60fcbee11fe4fe7ba806219c3c16bb5a574;p=chaz%2Fopenbox

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 1c31a253..447869aa 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -26,7 +26,7 @@ static guint button;
 static guint32 corner;
 static ObCorner lockcorner;
 
-static Popup *popup = NULL;
+static ObPopup *popup = NULL;
 
 static void client_dest(gpointer client)
 {
@@ -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;
@@ -61,7 +64,7 @@ static void popup_coords(ObClient *c, char *format, int a, int b)
                    c->area.width / 2,
                    c->frame->area.y + c->frame->size.top +
                    c->area.height / 2);
-    popup_show(popup, text, NULL);
+    popup_show(popup, text);
     g_free(text);
 }