diff options
| author | John Sullivan <sullivan@src.gnome.org> | 2001-02-06 18:09:02 +0000 |
|---|---|---|
| committer | John Sullivan <sullivan@src.gnome.org> | 2001-02-06 18:09:02 +0000 |
| commit | a240c1c7a7aea4435e47f257e083d1c96fdcbc76 (patch) | |
| tree | 098d767692b438f560ed72ec740f38f6b25a8fc4 | |
| parent | 4a6e69fd94ba463c1e60bfc6aa531f11e117f199 (diff) | |
| download | nautilus-a240c1c7a7aea4435e47f257e083d1c96fdcbc76.tar.gz | |
reviewed by: Gene Ragan <gzr@eazel.com>
Fixed bug 6365 (Crash at boot if invalid file name given)
* src/nautilus-window-manage-views.c:
(load_new_location_in_all_views): Added some parameter checking
to make future bugs like this even easier to find.
(cancel_location_change): Don't reset to old location when old
location is NULL.
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | src/nautilus-window-manage-views.c | 6 |
2 files changed, 17 insertions, 1 deletions
@@ -1,3 +1,15 @@ +2001-02-06 John Sullivan <sullivan@eazel.com> + + reviewed by: Gene Ragan <gzr@eazel.com> + + Fixed bug 6365 (Crash at boot if invalid file name given) + + * src/nautilus-window-manage-views.c: + (load_new_location_in_all_views): Added some parameter checking + to make future bugs like this even easier to find. + (cancel_location_change): Don't reset to old location when old + location is NULL. + 2001-02-05 Pavel Cisler <pavel@eazel.com> reviewed by: Seth Nickel <seth@eazel.com> diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c index 449922728..5298d309e 100644 --- a/src/nautilus-window-manage-views.c +++ b/src/nautilus-window-manage-views.c @@ -848,6 +848,9 @@ load_new_location_in_all_views (NautilusWindow *window, GList *selection, NautilusViewFrame *view_to_skip) { + g_assert (NAUTILUS_IS_WINDOW (window)); + g_assert (location != NULL); + set_displayed_location (window, location); if (window->new_content_view != view_to_skip && window->new_content_view != NULL) { @@ -1051,7 +1054,8 @@ static void cancel_location_change (NautilusWindow *window) { NautilusViewFrame *skip_view; - if (window->details->pending_location != NULL) { + if (window->details->pending_location != NULL + && window->details->location != NULL) { /* Tell previously-notified views to go back to the old page */ if (window->new_content_view == NULL |