[rhythmbox] rhythmdb: don't explode if ignore and error types are the same

[Jonathan Matthew <jmatthew src gnome org>]

commit 88080c2944675e2f611e7c590381a726f21b92e3
Author: Jonathan Matthew <jonathan d14n org>
Date:   Sat Sep 22 22:10:31 2012 +1000

    rhythmdb: don't explode if ignore and error types are the same
    
    Sometimes we don't really care about import errors vs ignored files,
    so using the same entry type for both should work.

 rhythmdb/rhythmdb.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/rhythmdb/rhythmdb.c b/rhythmdb/rhythmdb.c
index 47708e1..f28f80d 100644
--- a/rhythmdb/rhythmdb.c
+++ b/rhythmdb/rhythmdb.c
@@ -2212,7 +2212,7 @@ rhythmdb_add_import_error_entry (RhythmDB *db,
 			/* delete the existing entry, then create a new one below */
 			rhythmdb_entry_delete (db, entry);
 			entry = NULL;
-		} else if (error_entry_type == event->error_type) {
+		} else if (error_entry_type == event->error_type && event->error) {
 			/* we've already got an error for this file, so just update it */
 			g_value_init (&value, G_TYPE_STRING);
 			g_value_set_string (&value, event->error->message);
@@ -2281,7 +2281,7 @@ rhythmdb_add_import_error_entry (RhythmDB *db,
 			} else if (rb_metadata_has_missing_plugins (event->metadata)) {
 				rb_debug ("ignoring missing plugins for non-audio file");
 			}
-		} else if (error_entry_type == event->error_type && event->error->message) {
+		} else if (error_entry_type == event->error_type && event->error && event->error->message) {
 			g_value_init (&value, G_TYPE_STRING);
 			if (g_utf8_validate (event->error->message, -1, NULL))
 				g_value_set_string (&value, event->error->message);