From: Dana Jansens Date: Fri, 14 Oct 2011 22:52:36 +0000 (-0400) Subject: it would seem this cannot return NULL now X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=332280daf9a4bc410544ae7d267092a11ab8c945;p=chaz%2Fopenbox it would seem this cannot return NULL now It will get the primary monitor if there is not monitor under the pointer. But assert so it's clear something went wrong if this does happen. Note that there was previously no check for the return value even though the comment claimed there should be. --- diff --git a/openbox/place.c b/openbox/place.c index d56adfc8..a13bc2cb 100644 --- a/openbox/place.c +++ b/openbox/place.c @@ -451,9 +451,10 @@ static gboolean place_per_app_setting(ObClient *client, gint *x, gint *y, ob_debug("placing by per-app settings"); /* Find which head the pointer is on */ - if (settings->monitor == 0) - /* this can return NULL */ + if (settings->monitor == 0) { screen = pick_pointer_head(client); + g_assert(screen); + } else { guint m = settings->monitor; if (m < 1 || m > screen_num_monitors)