Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime van Kessel <nallath@gmail.com>2019-04-04 15:28:29 +0300
committerJaime van Kessel <nallath@gmail.com>2019-04-04 15:28:29 +0300
commit8acafe09f65fe7c067098b2a810b3b22b9fa7e28 (patch)
tree03cb4fda432db3db07ab40a5821adea962ba1699 /cura/Backups
parent29a55c29530a048a9ad859686e33248fb87ab615 (diff)
No longer prevent old versions from being restored in backup
CURA-5983
Diffstat (limited to 'cura/Backups')
-rw-r--r--cura/Backups/Backup.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/cura/Backups/Backup.py b/cura/Backups/Backup.py
index 714d6527fe..399a4ea7b0 100644
--- a/cura/Backups/Backup.py
+++ b/cura/Backups/Backup.py
@@ -116,12 +116,13 @@ class Backup:
current_version = self._application.getVersion()
version_to_restore = self.meta_data.get("cura_release", "master")
- if current_version != version_to_restore:
- # Cannot restore version older or newer than current because settings might have changed.
- # Restoring this will cause a lot of issues so we don't allow this for now.
+
+ if current_version < version_to_restore:
+ # Cannot restore version newer than current because settings might have changed.
+ Logger.log("d", "Tried to restore a Cura backup of version {version_to_restore} with cura version {current_version}".format(version_to_restore = version_to_restore, current_version = current_version))
self._showMessage(
self.catalog.i18nc("@info:backup_failed",
- "Tried to restore a Cura backup that does not match your current version."))
+ "Tried to restore a Cura backup that is higher than the current version."))
return False
version_data_dir = Resources.getDataStoragePath()