[gnome-desktop] Don't fall over if RANDR is missing
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-desktop] Don't fall over if RANDR is missing
- Date: Sun, 1 May 2011 14:07:04 +0000 (UTC)
commit aa93854f2ba6b0f72f1bdff9699b5724a72c89c9
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Apr 30 20:48:03 2011 -0400
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.
This fixes https://bugzilla.gnome.org/show_bug.cgi?id=649053
libgnome-desktop/gnome-rr.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
index 4a9d98e..eb3d735 100644
--- a/libgnome-desktop/gnome-rr.c
+++ b/libgnome-desktop/gnome-rr.c
@@ -748,7 +748,8 @@ gnome_rr_screen_finalize (GObject *gobject)
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 (gnome_rr_screen_parent_class)->finalize (gobject);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]