diff options
| author | Darin Adler <darin@bentspoon.com> | 2002-04-05 15:54:30 +0000 |
|---|---|---|
| committer | David Emory Watson <dwatson@src.gnome.org> | 2002-04-05 15:54:30 +0000 |
| commit | 01c45f9049aacfc3bc51be77e450ea0c06d5ec8a (patch) | |
| tree | 2a40f39a7a72a391e409360b63d934e72b83a4ff | |
| parent | 163e14d4ec4a506c54c27fd8112b63d07d94889e (diff) | |
| download | nautilus-01c45f9049aacfc3bc51be77e450ea0c06d5ec8a.tar.gz | |
I committed this for Darin:
2002-04-05 Darin Adler <darin@bentspoon.com>
* libnautilus-private/nautilus-metafile.c:
(metafile_read_check_for_directory): fix bug 77520 by replacing assert
with conditional call to metafile_read_done.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-metafile.c | 5 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2002-04-05 Darin Adler <darin@bentspoon.com> + + * libnautilus-private/nautilus-metafile.c: + (metafile_read_check_for_directory): fix bug 77520 by replacing assert + with conditional call to metafile_read_done. + 2002-04-01 Havoc Pennington <hp@redhat.com> * libnautilus-private/nautilus-thumbnails.c: backport fix to use diff --git a/libnautilus-private/nautilus-metafile.c b/libnautilus-private/nautilus-metafile.c index f8db96cad..1b3e3d4a1 100644 --- a/libnautilus-private/nautilus-metafile.c +++ b/libnautilus-private/nautilus-metafile.c @@ -1727,7 +1727,10 @@ metafile_read_check_for_directory (NautilusMetafile *metafile) * which in turn only happens if the URI is one that gnome-vfs * can handle. */ - g_assert (metafile->details->directory_vfs_uri != NULL); + if (metafile->details->directory_vfs_uri == NULL) { + metafile_read_done (metafile); + return; + } /* We have to do a get_info call to check if this a directory. */ fake_list.data = metafile->details->directory_vfs_uri; |