summaryrefslogtreecommitdiff
path: root/libmate-desktop
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-11-08 01:55:56 +0100
committerinfirit <[email protected]>2014-11-28 08:51:51 +0100
commit2a02df0b8f14916cfeb7b7c4dcc4ff6c077abae4 (patch)
tree8bdc009dd911ac90286030f2a883ee5f91e2bcf5 /libmate-desktop
parent6f9649e9c574e89989fd91333e915695550a15ab (diff)
downloadmate-desktop-2a02df0b8f14916cfeb7b7c4dcc4ff6c077abae4.tar.bz2
mate-desktop-2a02df0b8f14916cfeb7b7c4dcc4ff6c077abae4.tar.xz
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 <[email protected]> Gnome bug: tps://bugzilla.gnome.org/show_bug.cgi?id=649053
Diffstat (limited to 'libmate-desktop')
-rw-r--r--libmate-desktop/mate-rr.c3
1 files changed, 2 insertions, 1 deletions
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);
}