GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 18:49:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Definitions could be partly saved between backup restore and quit.

Browse Source 
part of CURA-7325
This commit is contained in:
Remco Burema 2020-03-26 18:19:47 +01:00
parent 0841124389
commit 3c50b78e68
No known key found for this signature in database
GPG Key ID: 215C49431D43F98C
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cura/Backups/BackupsManager.py
View File

@ -48,9 +48,10 @@ class BackupsManager:
# We don't want to store the data at this point as that would override the just-restored backup. # We don't want to store the data at this point as that would override the just-restored backup.
self._application.windowClosed(save_data = False) self._application.windowClosed(save_data = False)
## Here we try to disable the auto-save plug-in as it might interfere with ## Here we try to disable the auto-save plug-in and other saving as it might interfere with
# restoring a back-up. # restoring a back-up.
def _disableAutoSave(self) -> None: def _disableAutoSave(self) -> None:
self._application.enableSave(False)
auto_save = self._application.getAutoSave() auto_save = self._application.getAutoSave()
# The auto save is only not created if the application has not yet started. # The auto save is only not created if the application has not yet started.
if auto_save: if auto_save:
@ -58,8 +59,9 @@ class BackupsManager:
else: else:
Logger.log("e", "Unable to disable the autosave as application init has not been completed") Logger.log("e", "Unable to disable the autosave as application init has not been completed")
## Re-enable auto-save after we're done. ## Re-enable auto-save and other saving after we're done.
def _enableAutoSave(self) -> None: def _enableAutoSave(self) -> None:
self._application.enableSave(True)
auto_save = self._application.getAutoSave() auto_save = self._application.getAutoSave()
# The auto save is only not created if the application has not yet started. # The auto save is only not created if the application has not yet started.
if auto_save: if auto_save:

8
cura/CuraApplication.py
View File

@ -242,6 +242,7 @@ class CuraApplication(QtApplication):
# Backups # Backups
self._auto_save = None # type: Optional[AutoSave] self._auto_save = None # type: Optional[AutoSave]
self._enable_save = True
self._container_registry_class = CuraContainerRegistry self._container_registry_class = CuraContainerRegistry
# Redefined here in order to please the typing. # Redefined here in order to please the typing.
@ -685,15 +686,20 @@ class CuraApplication(QtApplication):
self._message_box_callback = None self._message_box_callback = None
self._message_box_callback_arguments = [] self._message_box_callback_arguments = []
def enableSave(self, enable: bool):
self._enable_save = enable
# Cura has multiple locations where instance containers need to be saved, so we need to handle this differently. # Cura has multiple locations where instance containers need to be saved, so we need to handle this differently.
def saveSettings(self) -> None: def saveSettings(self) -> None:
if not self.started: if not self.started or not self._enable_save:
# Do not do saving during application start or when data should not be saved on quit. # Do not do saving during application start or when data should not be saved on quit.
return return
ContainerRegistry.getInstance().saveDirtyContainers() ContainerRegistry.getInstance().saveDirtyContainers()
self.savePreferences() self.savePreferences()
def saveStack(self, stack): def saveStack(self, stack):
if not self._enable_save:
return
ContainerRegistry.getInstance().saveContainer(stack) ContainerRegistry.getInstance().saveContainer(stack)
@pyqtSlot(str, result = QUrl) @pyqtSlot(str, result = QUrl)