From dcdfe612e739fbb2a6937eb3eee6d6f2401f6a19 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 30 Nov 2016 12:04:30 +0100 Subject: [PATCH] Added more robust fault handling for preferences while loading workspace CURA-1263 --- plugins/3MFReader/ThreeMFWorkspaceReader.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index e1f0173235..27993a4a47 100644 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -144,8 +144,19 @@ class ThreeMFWorkspaceReader(WorkspaceReader): # Copy a number of settings from the temp preferences to the global global_preferences = Preferences.getInstance() - global_preferences.setValue("general/visible_settings", temp_preferences.getValue("general/visible_settings")) - global_preferences.setValue("cura/categories_expanded", temp_preferences.getValue("cura/categories_expanded")) + + visible_settings = temp_preferences.getValue("general/visible_settings") + if visible_settings is None: + Logger.log("w", "Workspace did not contain visible settings. Leaving visibility unchanged") + else: + global_preferences.setValue("general/visible_settings", visible_settings) + + categories_expanded = temp_preferences.getValue("cura/categories_expanded") + if categories_expanded is None: + Logger.log("w", "Workspace did not contain expanded categories. Leaving them unchanged") + else: + global_preferences.setValue("cura/categories_expanded", categories_expanded) + Application.getInstance().expandedCategoriesChanged.emit() # Notify the GUI of the change self._id_mapping = {}