From fa45b38b2cf61d5619e8d9d063fb1a470ab4f086 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Fri, 7 Aug 2015 18:34:12 -0300 Subject: [bug] Encdecpool won't explode if stopped twice The encryption pool could be stopped twice and would break on the second attempt because it deletes the encryption queue variable. Added a condition to make sure it only deletes the encryption queue if it exists, making it more idempotent --- client/src/leap/soledad/client/encdecpool.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'client/src') diff --git a/client/src/leap/soledad/client/encdecpool.py b/client/src/leap/soledad/client/encdecpool.py index 8713497e..4cdb3cd4 100644 --- a/client/src/leap/soledad/client/encdecpool.py +++ b/client/src/leap/soledad/client/encdecpool.py @@ -191,10 +191,11 @@ class SyncEncrypterPool(SyncEncryptDecryptPool): Stop the encrypter pool. """ # close the sync queue - self._encr_queue.close() - q = self._encr_queue - del q - self._encr_queue = None + if self._encr_queue: + self._encr_queue.close() + q = self._encr_queue + del q + self._encr_queue = None SyncEncryptDecryptPool.stop(self) -- cgit v1.2.3