[DEBUG] Implement proper debugger termination

studio/debugtools/debugger.py

@@ -108,10 +108,10 @@ def stream_client(self):
             try:
                 msg = self._stream_client.recv()
             except (ConnectionAbortedError, ConnectionResetError, OSError):
-                self.exit()
+                self.terminate()
                 break
             if msg == "TERMINATE":
-                self.exit()
+                self.terminate()
                 break
             if hasattr(msg, "payload"):
                 msg.payload = unmarshal(msg.payload, self)
@@ -206,13 +206,21 @@ def destroy(self) -> None:
         super().destroy()
 
     def exit(self):
+        # Debugger initiated exit
         try:
             self.transmit("TERMINATE")
-            self.close_clients()
-            self.destroy()
+        except:
+            pass
         finally:
-            # Exit forcefully
-            os._exit(os.EX_OK)
+            self.destroy()
+
+    def terminate(self):
+        # Hook initiated exit
+        try:
+            self.close_clients()
+        except:
+            pass
+        self.destroy()
 
     @classmethod
     def run_process(cls, path) -> subprocess.Popen:

studio/debugtools/hook.py

@@ -157,6 +157,8 @@ def __init__(self, path=None):
         self._server_clients = []
         self.selection = []
         atexit.register(self.terminate)
+        # force close preferences
+        pref._release()
 
     @property
     def allow_hover(self):
@@ -338,27 +340,30 @@ def console_run(self):
         def run_command(last_compiled):
             try:
                 self.shell.runcode(last_compiled)
-            except SystemExit:
-                self.root.after(0, self.exit)
-
-            self.transmit(
-                Message("CONSOLE", payload={"note": "COMMAND_COMPLETE"})
-            )
+                self.transmit(
+                    Message("CONSOLE", payload={"note": "COMMAND_COMPLETE"})
+                )
+            except SystemExit as e:
+                _code = e.code
+                self.root.after(0, lambda: exit(_code))
 
         threading.Thread(target=run_command, args=(self.last_compiled,)).start()
         self.last_compiled = None
 
     def exit(self):
+        # Debugger initiated termination
         self.enable_hooks = False
+        try:
+            for client in self._server_clients:
+                client.close()
+        except:
+            pass
         self.root.quit()
-        self.terminate()
 
     def terminate(self):
+        # Hook initiated termination
         self.transmit("TERMINATE")
 
-        for client in self._server_clients:
-            client.close()
-
     def extract_base_class(self, widget):
         return extract_base_class(widget)