Merge branch 'dev' into merge/api-v2

2024-08-30 18:23:09 +00:00 · 2022-05-18 01:49:19 +03:00
parent 14665042c6 8cca74f355
commit 559a345f25
22 changed files with 1092 additions and 846 deletions
--- a/app/classes/shared/main_controller.py
+++ b/app/classes/shared/main_controller.py
@ -988,6 +988,7 @@ class Controller:
                Console.info(f"Deleting Server: ID {server_id} | Name: {server_name} ")

                srv_obj = server["server_obj"]
+                srv_obj.server_scheduler.shutdown()
                running = srv_obj.check_running()

                if running: