From a42c06d85385da7ce2e77c5f21f5fdf2bf9ca46c Mon Sep 17 00:00:00 2001 From: nickthetait Date: Mon, 8 Jun 2015 15:01:25 -0600 Subject: [PATCH] Enhance profile importing robustness Older style, missing or invalid settings will revert to default values. Fixes #117. --- Cura/util/profile.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Cura/util/profile.py b/Cura/util/profile.py index 301b9c9b..733a9537 100644 --- a/Cura/util/profile.py +++ b/Cura/util/profile.py @@ -737,11 +737,16 @@ def loadProfile(filename, allMachines = False): section = 'profile' if set.isAlteration(): section = 'alterations' - if profileParser.has_option(section, set.getName()): - set.setValue(unicode(profileParser.get(section, set.getName()), 'utf-8', 'replace')) - #Upgrade setting from older ini file - if getProfileSetting('retraction_combing') == '1': - putProfileSetting('retraction_combing', 'All') + setting_name = set.getName() + if profileParser.has_option(section, setting_name): + try: + setting = profileParser.get(section, setting_name) + if setting == "Invalid Value": + raise Exception + set.setValue(unicode(setting, 'utf-8', 'replace')) + pass + except: + set.setValue(set.getDefault()) def saveProfile(filename, allMachines = False): """ -- 2.30.2