diff --git a/CHANGELOG.md b/CHANGELOG.md index 6709bb9c..50828b04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ CHANGELOG for FlatCAM beta - GUI Element FCLineEdit (and the inheritors) has now disabled cut/paste/delete context menu entries too - Cleaned the GUI in Excellon Preferences of parameters no longer used (transferred to Drilling Tool) - Removed warning message boxes from export DXF/SVG handlers of the menu entries in the File menu and upgraded the status bar message to error +- reactivated the close_app Qt signal mechanism 20.11.2020 diff --git a/app_Main.py b/app_Main.py index 3d85b8ef..3e8e2ea7 100644 --- a/app_Main.py +++ b/app_Main.py @@ -3699,14 +3699,16 @@ class App(QtCore.QObject): try: # self.new_launch.thread_exit = True # self.new_launch.listener.close() - self.new_launch.stop.emit() + if sys.platform == 'win32' or sys.platform == 'linux': + self.new_launch.stop.emit() except Exception as err: self.log.debug("App.quit_application() --> %s" % str(err)) # try to quit the QThread that run ArgsThread class try: # del self.new_launch - self.listen_th.quit() + if sys.platform == 'win32' or sys.platform == 'linux': + self.listen_th.quit() except Exception as e: self.log.debug("App.quit_application() --> %s" % str(e)) @@ -3715,9 +3717,9 @@ class App(QtCore.QObject): self.clear_pool() # quit app by signalling for self.kill_app() method - # self.close_app_signal.emit() - QtWidgets.qApp.quit() - sys.exit(0) + self.close_app_signal.emit() + # QtWidgets.qApp.quit() + # sys.exit(0) # When the main event loop is not started yet in which case the qApp.quit() will do nothing # we use the following command