From 148655c59f9a1264290926a3b94275660e9706be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <forenjunkie@chello.at>
Date: Wed, 17 May 2017 14:30:31 +0200
Subject: [PATCH] Terminate esession only if it was active before

This is a regression from !96
---
 src/chat_control.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/chat_control.py b/src/chat_control.py
index 2b1e8fa05..e838bc323 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -1606,6 +1606,8 @@ class ChatControl(ChatControlBase):
             self.begin_e2e_negotiation()
 
     def terminate_esessions(self):
+        if not (self.session and self.session.enable_encryption):
+            return
         # e2e was enabled, disable it
         jid = str(self.session.jid)
         thread_id = self.session.thread_id