nautilus r14478 - in trunk: . src/file-manager

[cneumair svn gnome org]

Author: cneumair
Date: Sat Aug 16 11:38:59 2008
New Revision: 14478
URL: http://svn.gnome.org/viewvc/nautilus?rev=14478&view=rev

Log:
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.


Modified:
   trunk/ChangeLog
   trunk/src/file-manager/fm-directory-view.c

Modified: trunk/src/file-manager/fm-directory-view.c
==============================================================================
--- trunk/src/file-manager/fm-directory-view.c	(original)
+++ trunk/src/file-manager/fm-directory-view.c	Sat Aug 16 11:38:59 2008
@@ -7271,9 +7271,11 @@
 			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));
+				}
 			}
 		}
 	}