From 742c2fe6845366a37f4f29132c9bd64f92841da8 Mon Sep 17 00:00:00 2001
From: shortcutme <tamas@zeronet.io>
Date: Tue, 6 Jun 2017 00:05:43 +0200
Subject: [PATCH] Rev2099, Keep tor client running until update finished

---
 src/Config.py         | 2 +-
 src/Ui/UiWebsocket.py | 2 --
 zeronet.py            | 3 +++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Config.py b/src/Config.py
index e9e0c829a..3a437d6e6 100644
--- a/src/Config.py
+++ b/src/Config.py
@@ -10,7 +10,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.5.5"
-        self.rev = 2098
+        self.rev = 2099
         self.argv = argv
         self.action = None
         self.config_file = "zeronet.conf"
diff --git a/src/Ui/UiWebsocket.py b/src/Ui/UiWebsocket.py
index 411251b93..0a96cdc3e 100644
--- a/src/Ui/UiWebsocket.py
+++ b/src/Ui/UiWebsocket.py
@@ -825,8 +825,6 @@ def actionSiteSetLimit(self, to, size_limit):
     def actionServerUpdate(self, to):
         self.cmd("updating")
         sys.modules["main"].update_after_shutdown = True
-        if sys.modules["main"].file_server.tor_manager.tor_process:
-            sys.modules["main"].file_server.tor_manager.stopTor()
         SiteManager.site_manager.save()
         sys.modules["main"].file_server.stop()
         sys.modules["main"].ui_server.stop()
diff --git a/zeronet.py b/zeronet.py
index f8a5c4e75..5b68b4263 100755
--- a/zeronet.py
+++ b/zeronet.py
@@ -19,6 +19,7 @@ def main():
         if main.update_after_shutdown:  # Updater
             import gc
             import update
+            import atexit
             # Try cleanup openssl
             try:
                 if "lib.opensslVerify" in sys.modules:
@@ -48,6 +49,8 @@ def main():
                 handler.close()
                 logger.removeHandler(handler)
 
+            atexit._run_exitfuncs()
+
     except Exception, err:  # Prevent closing
         import traceback
         try: