1 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/keys/cswordtreekey.cpp b/src/backend/keys/cswordtreekey.cpp
index 4ea624f..2823e5f 100644
--- a/src/backend/keys/cswordtreekey.cpp
+++ b/src/backend/keys/cswordtreekey.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -51,7 +51,7 @@ bool CSwordTreeKey::setKey(const QString &newKey) {
         return setKey(newKey.toUtf8().constData());
     }
     else {
-        return setKey((const char*)cp1252Codec()->fromUnicode(newKey));
+        return setKey(cp1252Codec()->fromUnicode(newKey).constData());
     }
 }
 
@@ -65,7 +65,7 @@ bool CSwordTreeKey::setKey(const char *newKey) {
         root();
     }
 
-    return !Error();
+    return !popError();
 }
 
 QString CSwordTreeKey::getLocalNameUnicode() {