diff options
| author | Alexander Larsson <alexl@redhat.com> | 2008-10-17 09:54:41 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2008-10-17 09:54:41 +0000 |
| commit | eb4c87338905fffa2e07550b3dbabf1b0d8ccdb9 (patch) | |
| tree | ec0de4170b7815f90da9cf8f6ed4661812e0727a | |
| parent | bdf3bf5a9342c965b07beee3c17d72330a852328 (diff) | |
| download | nautilus-eb4c87338905fffa2e07550b3dbabf1b0d8ccdb9.tar.gz | |
Merged from trunk:
2008-10-17 Alexander Larsson <alexl@redhat.com>
Merged from trunk:
* 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=/branches/gnome-2-24/; revision=14731
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | src/nautilus-spatial-window.c | 9 |
2 files changed, 17 insertions, 2 deletions
@@ -1,3 +1,13 @@ +2008-10-17 Alexander Larsson <alexl@redhat.com> + + Merged from trunk: + + * 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 Alexander Larsson <alexl@redhat.com> Merged from trunk: 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); |