sync with bb cvs

[chaz/openbox] / src / XAtom.cc

diff --git a/src/XAtom.cc b/src/XAtom.cc
index 2f560995a5e73c7e7c110dccf7c3cde40eed7844..488c051109c04ceb24ee8b266a4f261326ac54d1 100644 (file)
--- a/src/XAtom.cc
+++ b/src/XAtom.cc
@@ -304,7 +304,7 @@ void XAtom::setValue(Window win, Atoms atom, StringType type,
   switch (type) {
   case ansi: t = _atoms[string]; break;
   case utf8: t = _atoms[utf8_string]; break;
-  default: assert(False); // unhandled StringType
+  default: assert(False); return; // unhandled StringType
   }
   setValue(win, _atoms[atom], t,
            reinterpret_cast<unsigned char *>(const_cast<char *>(value.c_str())),
@@ -454,7 +454,7 @@ bool XAtom::getValue(Window win, Atoms atom, StringType type,
   switch (type) {
   case ansi: t = _atoms[string]; break;
   case utf8: t = _atoms[utf8_string]; break;
-  default: assert(False); return; // unhandled StringType
+  default: assert(False); return False; // unhandled StringType
   }
   
   unsigned char *value;