summaryrefslogtreecommitdiff
path: root/libnautilus-private/nautilus-directory-async.c
diff options
context:
space:
mode:
Diffstat (limited to 'libnautilus-private/nautilus-directory-async.c')
-rw-r--r--libnautilus-private/nautilus-directory-async.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c
index 49757cf59..2f6d5beef 100644
--- a/libnautilus-private/nautilus-directory-async.c
+++ b/libnautilus-private/nautilus-directory-async.c
@@ -844,7 +844,8 @@ dequeue_pending_idle_callback (gpointer callback_data)
/* Add the MIME type to the set. */
if ((file_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE) != 0
- && directory->details->load_mime_list_hash != NULL) {
+ && directory->details->load_mime_list_hash != NULL
+ && file_info->mime_type != NULL) {
istr_set_insert (directory->details->load_mime_list_hash,
file_info->mime_type);
}
@@ -2522,7 +2523,8 @@ mime_list_one (NautilusDirectory *directory,
return;
}
- if ((info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE) != 0) {
+ if ((info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE) != 0 &&
+ info->mime_type != NULL) {
istr_set_insert (directory->details->mime_list_hash, info->mime_type);
}
}