From 24260b29b4c2652ca5a732e9c1462bc7ecc57a9c Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Sun, 19 Jan 2020 17:09:41 +0200 Subject: [PATCH] - fixed some bugs that are visible in Linux regarding the ArgsThread class: on app close we need to quit the QThread running the ArgsThread class and also close the opened Socket --- FlatCAMApp.py | 8 ++++++++ README.md | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/FlatCAMApp.py b/FlatCAMApp.py index dce2111f..1c843738 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -2681,6 +2681,9 @@ class App(QtCore.QObject): from flatcamGUI.PlotCanvasLegacy import ShapeCollectionLegacy self.tool_shapes = ShapeCollectionLegacy(obj=self, app=self, name="tool") + # used in the delayed shutdown self.start_delayed_quit() method + self.save_timer = None + # ############################################################################### # ################# ADDING FlatCAM EDITORS section ############################## # ############################################################################### @@ -5200,6 +5203,7 @@ class App(QtCore.QObject): del stgs log.debug("App.final_save() --> App UI state saved.") + self.th.quit() self.close_app_signal.emit() def kill_app(self): @@ -12654,6 +12658,10 @@ class ArgsThread(QtCore.QObject): conn.send('close') # close the current instance only if there are args if len(sys.argv) > 1: + try: + listener.close() + except Exception: + pass sys.exit() def serve(self, conn): diff --git a/README.md b/README.md index 2c446e8a..e99020bc 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing. ================================================= +19.01.2020 + +- fixed some bugs that are visible in Linux regarding the ArgsThread class: on app close we need to quit the QThread running the ArgsThread class and also close the opened Socket + 15.01.2020 - added key shortcuts and toolbar icons for the new tools: Align Object Tool (ALT+A) and Extract Drills (ALT+I)