From e23a9ea9970860f6ac0a8279feece6bca4213839 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 20 Jan 2016 14:42:32 +0100 Subject: [PATCH] Move the changing of the setting after import out of try-except It should never give an exception, so if it does, crash and burn the application. Contributes to issue CURA-37. --- plugins/LegacyProfileReader/LegacyProfileReader.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/LegacyProfileReader/LegacyProfileReader.py b/plugins/LegacyProfileReader/LegacyProfileReader.py index b32a317688..923c6f92f9 100644 --- a/plugins/LegacyProfileReader/LegacyProfileReader.py +++ b/plugins/LegacyProfileReader/LegacyProfileReader.py @@ -98,9 +98,10 @@ class LegacyProfileReader(ProfileReader): compiled = compile(old_setting_expression, new_setting, "eval") try: new_value = eval(compiled, {"math": math}, legacy_settings) #Pass the legacy settings as local variables to allow access to in the evaluation. - if profile.getSettingValue(new_setting) != new_value: #Not equal to the default. - profile.setSettingValue(new_setting, new_value) #Store the setting in the profile! except Exception as e: #Probably some setting name that was missing or something else that went wrong in the ini file. Logger.log("w", "Setting " + new_setting + " could not be set because the evaluation failed. Something is probably missing from the imported legacy profile.") + continue + if profile.getSettingValue(new_setting) != new_value: #Not equal to the default. + profile.setSettingValue(new_setting, new_value) #Store the setting in the profile! return profile \ No newline at end of file