diff options
| author | Gene Z. Ragan <gzr@eazel.com> | 2001-02-17 03:25:50 +0000 |
|---|---|---|
| committer | Gene Ragan <gzr@src.gnome.org> | 2001-02-17 03:25:50 +0000 |
| commit | b16e11d4eddca0da11b09629232c898c2ea0bfba (patch) | |
| tree | f9d19873feacd25fd78abc94f0bb33fe6752ad7e /src/file-manager | |
| parent | 49e74380f033946d20bf0bd0a1a0057f62469f22 (diff) | |
| download | nautilus-b16e11d4eddca0da11b09629232c898c2ea0bfba.tar.gz | |
reviewed by: Darin Adler <darin@eazel.com>
2001-02-16 Gene Z. Ragan <gzr@eazel.com>
reviewed by: Darin Adler <darin@eazel.com>
Fixed bug 6689, Segmentation fault from volume_in_black_list after
the death of the desktop.
* src/file-manager/fm-desktop-icon-view.c: (volume_in_black_list):
Add an assert to catch a NULL icon view being passed in. We need to
find out why this happens if it ever does.
* src/nautilus-application.c: (window_can_be_closed),
(is_last_closable_window), (volume_unmounted_callback):
Handle single window case in the code where we close the windows
the are displaying the contents of the unmounted volume. In the case
of a single window, direct it back to the default home directory.
Diffstat (limited to 'src/file-manager')
| -rw-r--r-- | src/file-manager/fm-desktop-icon-view.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c index f684a549f..78113149a 100644 --- a/src/file-manager/fm-desktop-icon-view.c +++ b/src/file-manager/fm-desktop-icon-view.c @@ -225,6 +225,8 @@ volume_in_black_list (FMDesktopIconView *icon_view, const NautilusVolume *volume) { GList *p; + + g_return_val_if_fail (FM_IS_DESKTOP_ICON_VIEW (icon_view), TRUE); for (p = icon_view->details->mount_black_list; p != NULL; p = p->next) { if (strcmp ((char *) p->data, volume->mount_path) == 0) { |