fix #1720 -- don't wait for the daemon eventhread to terminate but count on it to eventually die

python/src/deltachat/events.py

@@ -139,6 +139,7 @@ class EventThread(threading.Thread):
         self.account = account
         super(EventThread, self).__init__(name="events")
         self.setDaemon(True)
+        self._marked_for_shutdown = False
         self.start()
 
     @contextmanager
@@ -147,6 +148,9 @@ class EventThread(threading.Thread):
         yield
         self.account.log(message + " FINISHED")
 
+    def mark_shutdown(self):
+        self._marked_for_shutdown = True
+
     def wait(self):
         if self == threading.current_thread():
             # we are in the callback thread and thus cannot
@@ -164,10 +168,12 @@ class EventThread(threading.Thread):
             lib.dc_get_event_emitter(self.account._dc_context),
             lib.dc_event_emitter_unref,
         )
-        while 1:
+        while not self._marked_for_shutdown:
             event = lib.dc_get_next_event(event_emitter)
             if event == ffi.NULL:
                 break
+            if self._marked_for_shutdown:
+                break
             evt = lib.dc_event_get_id(event)
             data1 = lib.dc_event_get_data1_int(event)
             # the following code relates to the deltachat/_build.py's helper