Sfoglia il codice sorgente

- attempt to make TclCommand quit_flatcam work under Linux

Marius Stanciu 6 anni fa
parent
commit
cfa4f7ee7d
2 ha cambiato i file con 6 aggiunte e 1 eliminazioni
  1. 5 1
      FlatCAMApp.py
  2. 1 0
      README.md

+ 5 - 1
FlatCAMApp.py

@@ -1830,7 +1830,7 @@ class App(QtCore.QObject):
         # signal for displaying messages in status bar
         self.inform.connect(self.info)
         # signal to be called when the app is quiting
-        self.app_quit.connect(self.quit_application)
+        self.app_quit.connect(self.quit_application, type=Qt.QueuedConnection)
         self.message.connect(self.message_dialog)
         self.progress.connect(self.set_progress_bar)
 
@@ -5138,8 +5138,12 @@ class App(QtCore.QObject):
             del stgs
 
         log.debug("App.final_save() --> App UI state saved.")
+
         QtWidgets.qApp.quit()
 
+        if sys.platform != 'win32':
+            sys.exit()
+
     def on_portable_checked(self, state):
         """
         Callback called when the checkbox in Preferences GUI is checked.

+ 1 - 0
README.md

@@ -18,6 +18,7 @@ CAD program, and create G-Code for Isolation routing.
 - changes in the Preferences UI for NCC and Paint Tool in Tool Dia entry field
 - fixed Tcl commands that use the overlap parameter to switch from fraction to percentage
 - in Transform Tool mae sure that the buffer sub-tool parameters are better explained in tooltips
+- attempt to make TclCommand quit_flatcam work under Linux
 
 29.12.2019