From 03d07cce6bc74d35a4072c30aa6ec4c65c1cbad8 Mon Sep 17 00:00:00 2001 From: Christian Neumair Date: Sat, 16 Aug 2008 11:38:59 +0000 Subject: Ensure that hash table is not NULL before getting keys if the selection 2008-08-16 Christian Neumair * src/file-manager/fm-directory-view.c (update_restore_from_trash_action): Ensure that hash table is not NULL before getting keys if the selection does not contain exactly one item. svn path=/trunk/; revision=14478 --- ChangeLog | 7 +++++++ src/file-manager/fm-directory-view.c | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83523515a..6abea37a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-08-16 Christian Neumair + + * src/file-manager/fm-directory-view.c + (update_restore_from_trash_action): + Ensure that hash table is not NULL before getting keys if the + selection does not contain exactly one item. + 2008-08-16 Christian Neumair * src/file-manager/fm-directory-view.c diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 426e3f809..e61c789f9 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -7271,9 +7271,11 @@ update_restore_from_trash_action (GtkAction *action, original_file = nautilus_file_get_trash_original_file (files->data); } else { original_dirs_hash = get_original_directories (files, NULL); - original_dirs = g_hash_table_get_keys (original_dirs_hash); - if (original_dirs_hash != NULL && g_list_length (original_dirs) == 1) { - original_dir = nautilus_file_ref (NAUTILUS_FILE (original_dirs->data)); + if (original_dirs_hash != NULL) { + original_dirs = g_hash_table_get_keys (original_dirs_hash); + if (g_list_length (original_dirs) == 1) { + original_dir = nautilus_file_ref (NAUTILUS_FILE (original_dirs->data)); + } } } } -- cgit v1.2.1