From 2a02df0b8f14916cfeb7b7c4dcc4ff6c077abae4 Mon Sep 17 00:00:00 2001 From: infirit Date: Sat, 8 Nov 2014 01:55:56 +0100 Subject: Don't fall over if RANDR is missing When RANDR is not present, the screen object never gets an info, and since screen_info_free asserts, we must not call it unconditionally in finalize. Based on gnome-desktop commit: aa93854f2ba6b0f72f1bdff9699b5724a72c89c9 From: Matthias Clasen Gnome bug: tps://bugzilla.gnome.org/show_bug.cgi?id=649053 --- libmate-desktop/mate-rr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libmate-desktop/mate-rr.c b/libmate-desktop/mate-rr.c index be047fe..8d7f3a6 100644 --- a/libmate-desktop/mate-rr.c +++ b/libmate-desktop/mate-rr.c @@ -756,7 +756,8 @@ void gdk_window_remove_filter (screen->priv->gdk_root, screen_on_event, screen); - screen_info_free (screen->priv->info); + if (screen->priv->info) + screen_info_free (screen->priv->info); G_OBJECT_CLASS (mate_rr_screen_parent_class)->finalize (gobject); } -- cgit v1.2.1