diff options
| author | Christian Neumair <cneumair@gnome.org> | 2008-08-16 11:38:59 +0000 |
|---|---|---|
| committer | Christian Neumair <cneumair@src.gnome.org> | 2008-08-16 11:38:59 +0000 |
| commit | 03d07cce6bc74d35a4072c30aa6ec4c65c1cbad8 (patch) | |
| tree | a45ba8ca52bf19c97876bf7f85e7dd11ee29474b | |
| parent | 2e68dc0dc3cc9adc9c9502812451097712537b6c (diff) | |
| download | nautilus-03d07cce6bc74d35a4072c30aa6ec4c65c1cbad8.tar.gz | |
Ensure that hash table is not NULL before getting keys if the selection
2008-08-16 Christian Neumair <cneumair@gnome.org>
* 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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 8 |
2 files changed, 12 insertions, 3 deletions
@@ -1,6 +1,13 @@ 2008-08-16 Christian Neumair <cneumair@gnome.org> * 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 <cneumair@gnome.org> + + * src/file-manager/fm-directory-view.c (action_restore_from_trash_callback), (locations_from_file_list), (restore_from_trash), (action_location_restore_from_trash_callback), 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)); + } } } } |