diff options
| author | Alexander Larsson <alexl@redhat.com> | 2008-10-17 09:47:30 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2008-10-17 09:47:30 +0000 |
| commit | 778efbaa546a45a4170eb61ca4d1e4e1760abe51 (patch) | |
| tree | f4f6f53079726adb86859f9bdb288613175250bf | |
| parent | f444e3e97096cd480cb3d86b3cc2e089a0826428 (diff) | |
| download | nautilus-778efbaa546a45a4170eb61ca4d1e4e1760abe51.tar.gz | |
Don't access NULL slot->viewed_file if its not been set yet.
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.
svn path=/trunk/; revision=14730
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/nautilus-spatial-window.c | 9 |
2 files changed, 15 insertions, 2 deletions
@@ -1,3 +1,11 @@ +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. + 2008-10-13 Nelson Benítez León <nbenitez@svn.gnome.org> * libnautilus-private/nautilus-file-operations.c diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c index 6c6a0cd48..cd91c3da3 100644 --- a/src/nautilus-spatial-window.c +++ b/src/nautilus-spatial-window.c @@ -290,7 +290,8 @@ nautilus_spatial_window_save_scroll_position (NautilusWindowSlot *slot) window = NAUTILUS_WINDOW (slot->window); - if (slot->content_view == NULL) { + if (slot->content_view == NULL || + slot->viewed_file == NULL) { return; } @@ -309,6 +310,10 @@ nautilus_spatial_window_save_show_hidden_files_mode (NautilusWindowSlot *slot) 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 @@ real_window_close (NautilusWindow *window) 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); |