From 8a994b555956a97fe5176e5c94936f8182d0d3a0 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Sat, 21 Dec 2019 02:59:50 +0100 Subject: [PATCH] Ask before UiWebsocket server shutdown action --- src/Ui/UiWebsocket.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/Ui/UiWebsocket.py b/src/Ui/UiWebsocket.py index ddbb6839..d8441af6 100644 --- a/src/Ui/UiWebsocket.py +++ b/src/Ui/UiWebsocket.py @@ -1148,10 +1148,20 @@ class UiWebsocket(object): @flag.no_multiuser def actionServerShutdown(self, to, restart=False): import main + def cbServerShutdown(res): + self.response(to, res) + if not res: + return False + if restart: + main.restart_after_shutdown = True + main.file_server.stop() + main.ui_server.stop() + if restart: - main.restart_after_shutdown = True - main.file_server.stop() - main.ui_server.stop() + message = [_["Restart ZeroNet client?"], _["Restart"]] + else: + message = [_["Shut down ZeroNet client?"], _["Shut down"]] + self.cmd("confirm", message, cbServerShutdown) @flag.admin @flag.no_multiuser