raise windows when they change modality

[chaz/openbox] / openbox / prop.c

diff --git a/openbox/prop.c b/openbox/prop.c
index 16ab60cbed7dbb5b8faf599e69231f460e2340c2..25495ef44cae6366f46c7f345145c6270a124c6e 100644 (file)
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -289,12 +289,16 @@ gboolean prop_get_string_locale(Window win, Atom prop, char **ret)
 {
     char **list;
     int nstr;
+    char *s;
 
     if (get_stringlist(win, prop, &list, &nstr) && nstr) {
-        *ret = g_convert(list[0], strlen(list[0]), "UTF-8", "ISO-8859-1",
-                         NULL, NULL, NULL);
+        s = g_convert(list[0], strlen(list[0]), "UTF-8", "ISO-8859-1",
+                      NULL, NULL, NULL);
         XFreeStringList(list);
-        if (*ret) return TRUE;
+        if (s) {
+            *ret = s;
+            return TRUE;
+        }
     }
     return FALSE;
 }