From fc085217c952704806c8abb3828f7bfdfacf4da3 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Mon, 31 Jan 2022 22:25:43 +0200 Subject: [PATCH] - minor change in the way the app quits --- CHANGELOG.md | 3 ++- app_Main.py | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfa2f1fe..b945431b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ CHANGELOG for FlatCAM beta - most of the logging (except in the Editors) is now done by the AppLogging class - made sure that for laser preprocessors, the laser is always turned off completely at the end of a job - added a new script example -- improved the quit application process; now the `quit_flatcam` Tcl command works properly +- improved the quit application process; now the `quit_app` Tcl command works properly - another fix for Shapely 2.0 deprecation warning - yet another fix for Shapely 2.0 deprecation warnings - updated the `join_geometry` and `join_excellon` Tcl commands format to follow the format of other commands @@ -25,6 +25,7 @@ CHANGELOG for FlatCAM beta - fixed an issue in `panelize` Tcl command where some parameters (`spacing_columns` and `spacing_rows` where forced into integers where correct was to keep them as floats) - fixed a performance issue in `panelize` Tcl command: when panelizing a Geometry object the total solid_geometry was calculated for each tool, but it was enough to be calculated once - yet another fix for a Shapely 2.0 deprecation warning +- minor change in the way the app quits 30.01.2022 diff --git a/app_Main.py b/app_Main.py index 823f8d85..874ce3d8 100644 --- a/app_Main.py +++ b/app_Main.py @@ -4161,7 +4161,11 @@ class App(QtCore.QObject): # self.close_app_signal.emit() # sys.exit(0) QtWidgets.QApplication.quit() - self.new_launch.close_command() + if sys.platform == 'win32' or sys.platform == 'linux': + try: + self.new_launch.close_command() + except Exception: + pass @staticmethod def kill_app():