sync with bb. mostly cleanups in Window.cc

[chaz/openbox] / src / Util.cc

diff --git a/src/Util.cc b/src/Util.cc
index 9dadb3e10ea510fcd73961536fdc7f8958d83a3b..514774239c1b4de4f1c03c329f75c7c72c73c0f4 100644 (file)
--- a/src/Util.cc
+++ b/src/Util.cc
@@ -188,8 +188,9 @@ string textPropertyToString(Display *display, XTextProperty& text_prop) {
   string ret;
 
   if (text_prop.value && text_prop.nitems > 0) {
-    ret = (char *) text_prop.value;
-    if (text_prop.encoding != XA_STRING) {
+    if (text_prop.encoding == XA_STRING) {
+      ret = (char *) text_prop.value;
+    } else {
       text_prop.nitems = strlen((char *) text_prop.value);
 
       char **list;