allow style options in the rc file to override those found in the style

[chaz/openbox] / src / Util.cc

diff --git a/src/Util.cc b/src/Util.cc
index a97ffe50a591baa91a3ec11b54109c4e51a61dfb..1b521aafb6f872259e2eff92e64a7486194e55a3 100644 (file)
--- a/src/Util.cc
+++ b/src/Util.cc
@@ -52,6 +52,8 @@ extern "C" {
 
 #include <X11/Xatom.h>
 
+#include <assert.h>
+
 #include <algorithm>
 
 #include "Util.hh"
@@ -180,8 +182,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;