- fixed issue with not possible to close the app after a project save.
This commit is contained in:
@@ -3180,7 +3180,7 @@ class App(QtCore.QObject):
|
|||||||
def final_save(self):
|
def final_save(self):
|
||||||
|
|
||||||
if self.save_in_progress:
|
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
|
return
|
||||||
|
|
||||||
if self.should_we_save and self.collection.get_list():
|
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.log.debug("save_project()")
|
||||||
|
|
||||||
self.save_in_progress = True
|
|
||||||
|
|
||||||
with self.proc_container.new(_("Saving FlatCAM Project")) as proc:
|
with self.proc_container.new(_("Saving FlatCAM Project")) as proc:
|
||||||
## Capture the latest changes
|
## Capture the latest changes
|
||||||
# Current object
|
# Current object
|
||||||
@@ -7958,6 +7956,7 @@ The normal flow when working in FlatCAM is the following:</span></p>
|
|||||||
if quit:
|
if quit:
|
||||||
# t = threading.Thread(target=lambda: self.check_project_file_size(1, filename=filename))
|
# t = threading.Thread(target=lambda: self.check_project_file_size(1, filename=filename))
|
||||||
# t.start()
|
# t.start()
|
||||||
|
self.save_in_progress = True
|
||||||
self.start_delayed_quit(delay=500, filename=filename)
|
self.start_delayed_quit(delay=500, filename=filename)
|
||||||
|
|
||||||
def start_delayed_quit(self, delay, filename):
|
def start_delayed_quit(self, delay, filename):
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ CAD program, and create G-Code for Isolation routing.
|
|||||||
6.04.2019
|
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 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
|
5.04.2019
|
||||||
|
|
||||||
|
|||||||
@@ -2371,7 +2371,6 @@ class FlatCAMExcEditor(QtCore.QObject):
|
|||||||
|
|
||||||
## Non-iterable
|
## Non-iterable
|
||||||
except TypeError:
|
except TypeError:
|
||||||
|
|
||||||
## DrawToolShape
|
## DrawToolShape
|
||||||
if isinstance(geometry, DrawToolShape):
|
if isinstance(geometry, DrawToolShape):
|
||||||
plot_elements += self.plot_shape(geometry=geometry.geo, color=color, linewidth=linewidth)
|
plot_elements += self.plot_shape(geometry=geometry.geo, color=color, linewidth=linewidth)
|
||||||
|
|||||||
Reference in New Issue
Block a user