X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fplace.c;h=aa572db2aff2a34eb804bdffc15eff0a79b0657f;hb=040d344a89f40487de8a1920e0aaeccd93a6a995;hp=9892836ec80a3ce9de4ce2c585eb27e06619ced4;hpb=d658612cac44ccc1406aea1bad48c851016e4751;p=chaz%2Fopenbox diff --git a/openbox/place.c b/openbox/place.c index 9892836e..aa572db2 100644 --- a/openbox/place.c +++ b/openbox/place.c @@ -182,7 +182,7 @@ static GSList* area_remove(GSList *list, Rect *a) if (!RECT_INTERSECTS_RECT(*r, *a)) { result = g_slist_prepend(result, r); - r = NULL; /* dont free it */ + /* dont free r, it's moved to the result list */ } else { Rect isect, extra; @@ -217,9 +217,10 @@ static GSList* area_remove(GSList *list, Rect *a) r->width, RECT_BOTTOM(*r) - RECT_BOTTOM(isect)); result = area_add(result, &extra); } - } - g_free(r); + /* 'r' is not being added to the result list, so free it */ + g_free(r); + } } g_slist_free(list); return result; @@ -253,8 +254,6 @@ static gboolean place_nooverlap(ObClient *c, gint *x, gint *y) /* try ignoring different things to find empty space */ for (ignore = 0; ignore < IGNORE_END && !ret; ignore++) { - guint i; - /* try all monitors in order of preference */ for (i = 0; i < screen_num_monitors && !ret; ++i) { GList *it;