Imported Upstream version 2.4.3

1 files changed, 9 insertions, 0 deletions

diff --git a/src/libaudgui/infowin.c b/src/libaudgui/infowin.c
index fdb6303..c103aba 100644
--- a/src/libaudgui/infowin.c
+++ b/src/libaudgui/infowin.c
@@ -774,6 +774,15 @@ static void infowin_show (const gchar * filename, const Tuple * tuple,
 
     tmp = g_strdup (filename);
     string_decode_percent (tmp);
+
+    /* Convert invalid UTF-8 URI's quietly. */
+    if (! g_utf8_validate (tmp, -1, NULL))
+    {
+        gchar * copy = str_to_utf8 (tmp);
+        g_free (tmp);
+        tmp = copy;
+    }
+
     gtk_label_set_text ((GtkLabel *) location_text, easy_read_filename (tmp));
     g_free (tmp);