فهرست منبع

- fixed issue with not possible to close the app after a project save.

Marius Stanciu 6 سال پیش
والد
کامیت
da991c103b
3فایلهای تغییر یافته به همراه3 افزوده شده و 4 حذف شده
  1. 2 3
      FlatCAMApp.py
  2. 1 0
      README.md
  3. 0 1
      flatcamEditors/FlatCAMExcEditor.py

+ 2 - 3
FlatCAMApp.py

@@ -3180,7 +3180,7 @@ class App(QtCore.QObject):
     def final_save(self):
 
         if self.save_in_progress:
-            self.inform.emit(_("Application is saving the project. Please wait ..."))
+            self.inform.emit(_("[WARNING_NOTCL] Application is saving the project. Please wait ..."))
             return
 
         if self.should_we_save and self.collection.get_list():
@@ -7897,8 +7897,6 @@ The normal flow when working in FlatCAM is the following:</span></p>
         """
         self.log.debug("save_project()")
 
-        self.save_in_progress = True
-
         with self.proc_container.new(_("Saving FlatCAM Project")) as proc:
             ## Capture the latest changes
             # Current object
@@ -7958,6 +7956,7 @@ The normal flow when working in FlatCAM is the following:</span></p>
             if quit:
                 # t = threading.Thread(target=lambda: self.check_project_file_size(1, filename=filename))
                 # t.start()
+                self.save_in_progress = True
                 self.start_delayed_quit(delay=500, filename=filename)
 
     def start_delayed_quit(self, delay, filename):

+ 1 - 0
README.md

@@ -12,6 +12,7 @@ CAD program, and create G-Code for Isolation routing.
 6.04.2019
 
 - fixed bug in Geometry Editor in buffer_int() function that created an Circular Reference Error when applying buffer interior on a geometry.
+- fixed issue with not possible to close the app after a project save.
 
 5.04.2019
 

+ 0 - 1
flatcamEditors/FlatCAMExcEditor.py

@@ -2371,7 +2371,6 @@ class FlatCAMExcEditor(QtCore.QObject):
 
         ## Non-iterable
         except TypeError:
-
             ## DrawToolShape
             if isinstance(geometry, DrawToolShape):
                 plot_elements += self.plot_shape(geometry=geometry.geo, color=color, linewidth=linewidth)