X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fircparser.cpp;h=f71f53c156cc48f95338f305b8621e5db7d306a9;hp=f558f5f245fbecd7db4f03512904e555995fdd98;hb=3146ad01b5b29c30adcf0044a52b39aa7e5796d0;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce

diff --git a/src/core/ircparser.cpp b/src/core/ircparser.cpp
index f558f5f2..f71f53c1 100644
--- a/src/core/ircparser.cpp
+++ b/src/core/ircparser.cpp
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "ircparser.h"
@@ -58,7 +58,7 @@ QByteArray IrcParser::decrypt(Network *network, const QString &bufferName, const
         return message;
 
     Cipher *cipher = qobject_cast<CoreNetwork *>(network)->cipher(bufferName);
-    if (!cipher)
+    if (!cipher || cipher->key().isEmpty())
         return message;
 
     return isTopic ? cipher->decryptTopic(message) : cipher->decrypt(message);