X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoreircchannel.cpp;h=4f2f4f31dec448f40700545a8d64f1daf9ea63f1;hb=8166d1701686588630cae9b44310790d084f8fd7;hp=98995bffed968834d8a9e8fb9e002a01e3c14927;hpb=3146ad01b5b29c30adcf0044a52b39aa7e5796d0;p=quassel.git diff --git a/src/core/coreircchannel.cpp b/src/core/coreircchannel.cpp index 98995bff..4f2f4f31 100644 --- a/src/core/coreircchannel.cpp +++ b/src/core/coreircchannel.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2012 by the Quassel Project * + * Copyright (C) 2005-2014 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -52,6 +52,8 @@ Cipher *CoreIrcChannel::cipher() const void CoreIrcChannel::setEncrypted(bool e) { + IrcChannel::setEncrypted(e); + if (!Cipher::neededFeaturesAvailable()) return; @@ -59,7 +61,7 @@ void CoreIrcChannel::setEncrypted(bool e) if (topic().isEmpty()) return; - QByteArray decrypted = cipher()->decryptTopic(topic().toAscii()); + QByteArray decrypted = cipher()->decryptTopic(topic().toLatin1()); setTopic(decodeString(decrypted)); } }