diff options
| author | John Sullivan <sullivan@src.gnome.org> | 2001-02-06 02:01:21 +0000 |
|---|---|---|
| committer | John Sullivan <sullivan@src.gnome.org> | 2001-02-06 02:01:21 +0000 |
| commit | f80a08a4edf20d87d68ce1c1648280969b0842a3 (patch) | |
| tree | 741bea0e196e29170b5c154ba73d0bf6bf3e0e4b | |
| parent | bda36da9aea1311ca9ba8f44e344e70d87f95760 (diff) | |
| download | nautilus-f80a08a4edf20d87d68ce1c1648280969b0842a3.tar.gz | |
reviewed by: Pavel Cisler <pavel@eazel.com>
Fixed part of bug 6329 (entering "gconf://" as location
crashes Nautilus). After this fix, it still crashes Nautilus,
but in a gconf-specific way.
* src/nautilus-window-manage-views.c:
(load_new_location_in_all_views): Don't try to load
a location in new_content_view if it's NULL.
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | src/nautilus-window-manage-views.c | 3 |
2 files changed, 14 insertions, 1 deletions
@@ -1,5 +1,17 @@ 2001-02-05 John Sullivan <sullivan@eazel.com> + reviewed by: Pavel Cisler <pavel@eazel.com> + + Fixed part of bug 6329 (entering "gconf://" as location + crashes Nautilus). After this fix, it still crashes Nautilus, + but in a gconf-specific way. + + * src/nautilus-window-manage-views.c: + (load_new_location_in_all_views): Don't try to load + a location in new_content_view if it's NULL. + +2001-02-05 John Sullivan <sullivan@eazel.com> + reviewed by: Mike Fleming <mfleming@eazel.com> Fixed bug 6324 (Switching views crashes every time) diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c index 80883c1ed..f1fe28fd4 100644 --- a/src/nautilus-window-manage-views.c +++ b/src/nautilus-window-manage-views.c @@ -849,7 +849,8 @@ load_new_location_in_all_views (NautilusWindow *window, NautilusViewFrame *view_to_skip) { set_displayed_location (window, location); - if (window->new_content_view != view_to_skip) { + if (window->new_content_view != view_to_skip + && window->new_content_view != NULL) { load_new_location_in_one_view (window->new_content_view, location, selection); |