From: Dana Jansens <danakj@orodu.net>
Date: Fri, 10 Oct 2003 04:33:12 +0000 (+0000)
Subject: dont set ret unless you will be returning TRUE
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=364bb1550abd7e586b3c148dfe2fb80eb73e48c9;p=chaz%2Fopenbox

dont set ret unless you will be returning TRUE
---

diff --git a/openbox/prop.c b/openbox/prop.c
index 16ab60cb..98bbbd99 100644
--- 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",
+        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;
 }