changeset 3119:4ba71e08fed0 trunk

Automated merge with ssh://hg.atheme.org//hg/audacious
author William Pitcock <nenolod@atheme-project.org>
date Thu, 19 Jul 2007 22:48:30 -0500
parents 6c0bb87fd672 (current diff) a2d234851527 (diff)
children 3262bf0b8831 3b6d316f8b09
files
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/strings.c	Thu Jul 19 22:48:07 2007 -0500
+++ b/src/audacious/strings.c	Thu Jul 19 22:48:30 2007 -0500
@@ -194,7 +194,9 @@
     gchar *out_str;
 
     /* NULL in NULL out */
-    g_return_val_if_fail(str != NULL, NULL);
+    /* g_return_val_if_fail(str != NULL, NULL); */
+    if (!str)
+        return NULL;
 
     /* Note: Currently, playlist calls this function repeatedly, even
      * if the string is already converted into utf-8.