From 01c6f4fef3e8522728fafee5392489e62b910dc9 Mon Sep 17 00:00:00 2001 From: rbuj Date: Wed, 16 Mar 2022 13:31:45 +0100 Subject: panel-multimonitor: Condition '*monitors_ret>0' is always false --- mate-panel/panel-multimonitor.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/mate-panel/panel-multimonitor.c b/mate-panel/panel-multimonitor.c index 532b31c3..b2723f12 100644 --- a/mate-panel/panel-multimonitor.c +++ b/mate-panel/panel-multimonitor.c @@ -240,21 +240,23 @@ static void panel_multimonitor_get_raw_monitors (int *monitors_ret, GdkRectangle **geometries_ret) { - gboolean res = FALSE; - *monitors_ret = 0; *geometries_ret = NULL; #ifdef HAVE_X11 #ifdef HAVE_RANDR if (GDK_IS_X11_DISPLAY (gdk_display_get_default ()) && have_randr) - res = panel_multimonitor_get_randr_monitors (monitors_ret, geometries_ret); + { + gboolean res; + + res = panel_multimonitor_get_randr_monitors (monitors_ret, + geometries_ret); + if (res && *monitors_ret > 0) + return; + } #endif /* HAVE_RANDR */ #endif /* HAVE_X11 */ - if (res && *monitors_ret > 0) - return; - panel_multimonitor_get_gdk_monitors (monitors_ret, geometries_ret); } -- cgit v1.2.1