nautilus r14730 - in trunk: . src

[alexl svn gnome org]

Author: alexl
Date: Fri Oct 17 09:47:30 2008
New Revision: 14730
URL: http://svn.gnome.org/viewvc/nautilus?rev=14730&view=rev

Log:
2008-10-17  Alexander Larsson  <alexl redhat com>

        * src/nautilus-spatial-window.c:
        (nautilus_spatial_window_save_scroll_position):
        (nautilus_spatial_window_save_show_hidden_files_mode):
        (real_window_close):
	Don't access NULL slot->viewed_file if its not been set yet.



Modified:
   trunk/ChangeLog
   trunk/src/nautilus-spatial-window.c

Modified: trunk/src/nautilus-spatial-window.c
==============================================================================
--- trunk/src/nautilus-spatial-window.c	(original)
+++ trunk/src/nautilus-spatial-window.c	Fri Oct 17 09:47:30 2008
@@ -290,7 +290,8 @@
 
 	window = NAUTILUS_WINDOW (slot->window);
 
-	if (slot->content_view == NULL) {
+	if (slot->content_view == NULL ||
+	    slot->viewed_file == NULL) {
 		return;
 	}
 	
@@ -309,6 +310,10 @@
 	char *show_hidden_file_setting;
 	NautilusWindowShowHiddenFilesMode mode;
 
+	if (slot->viewed_file == NULL) {
+		return;
+	}
+	
 	window = NAUTILUS_WINDOW (slot->window);
 
 	mode = NAUTILUS_WINDOW (window)->details->show_hidden_files_mode;
@@ -470,7 +475,7 @@
 	if (window->details->slots != NULL) {
 
 		slot = window->details->slots->data;
-		
+
 		nautilus_spatial_window_save_geometry (slot);
 		nautilus_spatial_window_save_scroll_position (slot);
 		nautilus_spatial_window_save_show_hidden_files_mode (slot);