From 399dc74d74d4996da886e6fd1ecf0c8b3905eb05 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Wed, 2 Mar 2011 16:21:44 +0100 Subject: [PATCH] settings: Avoid a segfault when loading keyfile When the keyfile is loaded, no screen exists yet, so we need to vheck for that. --- gtk/gtksettings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 44fe5c68ca..e2544066b0 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -2671,7 +2671,7 @@ settings_update_color_scheme (GtkSettings *settings) data, (GDestroyNotify) color_scheme_data_free); g_value_init (&value, G_TYPE_STRING); - if (gdk_screen_get_setting (priv->screen, "gtk-color-scheme", &value)) + if (priv->screen && gdk_screen_get_setting (priv->screen, "gtk-color-scheme", &value)) { merge_color_scheme (settings, &value, GTK_SETTINGS_SOURCE_XSETTING); g_value_unset (&value);