summaryrefslogtreecommitdiff
path: root/daemon/gvfsbackendcdda.c
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2013-03-14 11:38:47 +0100
committerBastien Nocera <hadess@hadess.net>2013-03-14 23:02:48 +0100
commit7855cb474a061b0908a2fa8f4b3687f1d9759e97 (patch)
treef2e6f42c876cf656630b9172a052824231567627 /daemon/gvfsbackendcdda.c
parent51ad0a98b0834fc7755e26ded721604ac890e8ff (diff)
downloadgvfs-7855cb474a061b0908a2fa8f4b3687f1d9759e97.tar.gz
cdda: Fix warnings for each track on the CD
(process:22937): GLib-CRITICAL **: g_convert: assertion `str != NULL' failed for each of the tracks as we tried to convert the genre (which was NULL) https://bugzilla.gnome.org/show_bug.cgi?id=695835
Diffstat (limited to 'daemon/gvfsbackendcdda.c')
-rw-r--r--daemon/gvfsbackendcdda.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/daemon/gvfsbackendcdda.c b/daemon/gvfsbackendcdda.c
index 11c6aea0..a8213a87 100644
--- a/daemon/gvfsbackendcdda.c
+++ b/daemon/gvfsbackendcdda.c
@@ -161,6 +161,9 @@ release_metadata (GVfsBackendCdda *cdda_backend)
static char *
cdtext_string_to_utf8 (const char *string)
{
+ if (string == NULL)
+ return NULL;
+
/* CD-text doesn't specify encoding. In case outside ascii, assume latin-1. */
return g_convert (string, -1, "UTF-8", "ISO-8859-1", NULL, NULL, NULL);
}