[tracker/tracker-0.14] tracker-extract-playlist: Don't error when to_metadata hash table is NULL
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/tracker-0.14] tracker-extract-playlist: Don't error when to_metadata hash table is NULL
- Date: Wed, 24 Oct 2012 16:19:04 +0000 (UTC)
commit 6eecbbda4b1e4c0c0f1873f7555d38af72c28720
Author: Martyn Russell <martyn lanedo com>
Date: Thu Oct 11 09:45:34 2012 +0100
tracker-extract-playlist: Don't error when to_metadata hash table is NULL
src/tracker-extract/tracker-extract-playlist.c | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-playlist.c b/src/tracker-extract/tracker-extract-playlist.c
index 7b0a058..f3a33e5 100644
--- a/src/tracker-extract/tracker-extract-playlist.c
+++ b/src/tracker-extract/tracker-extract-playlist.c
@@ -57,7 +57,6 @@ entry_parsed (TotemPlParser *parser,
GHashTable *to_metadata,
gpointer user_data)
{
- gchar *duration;
PlaylistMetadata *data;
data = (PlaylistMetadata *) user_data;
@@ -86,17 +85,21 @@ entry_parsed (TotemPlParser *parser,
tracker_sparql_builder_object_blank_close (data->metadata);
- duration = g_hash_table_lookup (to_metadata, TOTEM_PL_PARSER_FIELD_DURATION);
+ if (to_metadata) {
+ gchar *duration;
- if (duration == NULL) {
- duration = g_hash_table_lookup (to_metadata, TOTEM_PL_PARSER_FIELD_DURATION_MS);
- }
+ duration = g_hash_table_lookup (to_metadata, TOTEM_PL_PARSER_FIELD_DURATION);
+
+ if (duration == NULL) {
+ duration = g_hash_table_lookup (to_metadata, TOTEM_PL_PARSER_FIELD_DURATION_MS);
+ }
- if (duration != NULL) {
- gint64 secs = totem_pl_parser_parse_duration (duration, FALSE);
+ if (duration != NULL) {
+ gint64 secs = totem_pl_parser_parse_duration (duration, FALSE);
- if (secs > 0) {
- data->total_time += secs;
+ if (secs > 0) {
+ data->total_time += secs;
+ }
}
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]