Просмотр исходного кода

Also upgrade profiles if only the setting version is incorrect

We need to check both version numbers.
Ghostkeeper 5 лет назад
Родитель
Сommit
77d396b9bd
1 измененных файлов с 2 добавлено и 1 удалено
  1. 2 1
      plugins/CuraProfileReader/CuraProfileReader.py

+ 2 - 1
plugins/CuraProfileReader/CuraProfileReader.py

@@ -8,6 +8,7 @@ from UM.PluginRegistry import PluginRegistry
 from UM.Logger import Logger
 from UM.Settings.ContainerFormatError import ContainerFormatError
 from UM.Settings.InstanceContainer import InstanceContainer  # The new profile to make.
+from cura.CuraApplication import CuraApplication #To get the current setting version.
 from cura.ReaderWriters.ProfileReader import ProfileReader
 
 import zipfile
@@ -67,7 +68,7 @@ class CuraProfileReader(ProfileReader):
             return []
 
         version = int(parser["general"]["version"])
-        if InstanceContainer.Version != version:
+        if InstanceContainer.Version != version or "metadata" not in parser or "setting_version" not in parser["metadata"] or parser["metadata"]["setting_version"] != str(CuraApplication.SettingVersion):
             name = parser["general"]["name"]
             return self._upgradeProfileVersion(serialized, name, version)
         else: