From e1d911c083cdebcfd8f4163429a09802cfcff21c Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Sun, 19 Feb 2012 11:40:28 -0500 Subject: [PATCH] app-system: guard against NULL error on gmenu_tree_load_sync failure --- src/shell-app-system.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/shell-app-system.c b/src/shell-app-system.c index 0639ad8..84789fb 100644 --- a/src/shell-app-system.c +++ b/src/shell-app-system.c @@ -321,7 +321,8 @@ on_apps_tree_changed_cb (GMenuTree *tree, if (!gmenu_tree_load_sync (self->priv->apps_tree, &error)) { - g_warning ("Failed to load apps: %s", error->message); + g_warning ("Failed to load apps: %s", + (error != NULL) ? error->message : "unknown error"); return; } @@ -412,7 +413,8 @@ on_settings_tree_changed_cb (GMenuTree *tree, g_hash_table_remove_all (self->priv->setting_id_to_app); if (!gmenu_tree_load_sync (self->priv->settings_tree, &error)) { - g_warning ("Failed to load settings: %s", error->message); + g_warning ("Failed to load settings: %s", + (error != NULL) ? error->message : "unknown error"); return; } -- 1.7.8.4