From 1bfe328a1be791e28b9a92d70684d474a5023f96 Mon Sep 17 00:00:00 2001 From: Lola Dam Date: Fri, 1 Nov 2019 19:36:44 +0100 Subject: [PATCH] No restart after update (#2242) --- src/Ui/UiWebsocket.py | 3 ++- zeronet.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Ui/UiWebsocket.py b/src/Ui/UiWebsocket.py index 9a245377..a0d1b95b 100644 --- a/src/Ui/UiWebsocket.py +++ b/src/Ui/UiWebsocket.py @@ -1124,6 +1124,7 @@ class UiWebsocket(object): import main main.update_after_shutdown = True + main.restart_after_shutdown = True SiteManager.site_manager.save() main.file_server.stop() main.ui_server.stop() @@ -1234,4 +1235,4 @@ class UiWebsocket(object): else: gevent.spawn(main.file_server.checkSites, check_files=False, force_port_check=True) - self.response(to, "ok") \ No newline at end of file + self.response(to, "ok") diff --git a/zeronet.py b/zeronet.py index b1fda592..c3378732 100755 --- a/zeronet.py +++ b/zeronet.py @@ -38,8 +38,9 @@ def main(): import update print("Updating...") update.update() - print("Restarting...") - restart() + if main.restart_after_shutdown: + print("Restarting...") + restart() else: print("Shutting down...") prepareShutdown()