From e90cbcfa0146c36d41d51032cbfb40ce6f7bb64c Mon Sep 17 00:00:00 2001 From: Saumya Jain Date: Wed, 13 Mar 2024 13:38:46 +0100 Subject: [PATCH 1/2] not clearing the current machinein case of UCP because we don't want to write again the same thing. CURA-11701 --- plugins/3MFReader/ThreeMFWorkspaceReader.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index e6992611c1..164952f9f1 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -915,10 +915,6 @@ class ThreeMFWorkspaceReader(WorkspaceReader): # Prepare the machine self._applyChangesToMachine(global_stack, extruder_stack_dict) - else: - # Just clear the settings now, so that we can change the active machine without conflicts - self._clearMachineSettings(global_stack, {}) - Logger.log("d", "Workspace loading is notifying rest of the code of changes...") # Actually change the active machine. From 85b60c1f283ca28a68415c97a9d367c3f1b548d0 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 14 Mar 2024 11:17:12 +0100 Subject: [PATCH 2/2] Do not get user profile by loading auth data --- cura/OAuth2/AuthorizationService.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cura/OAuth2/AuthorizationService.py b/cura/OAuth2/AuthorizationService.py index 4e8d28173a..e62e00a793 100644 --- a/cura/OAuth2/AuthorizationService.py +++ b/cura/OAuth2/AuthorizationService.py @@ -305,7 +305,8 @@ class AuthorizationService: message_type = Message.MessageType.ERROR) Logger.warning("Unable to get user profile using auth data from preferences.") self._unable_to_get_data_message.show() - self.getUserProfile(callback) + if self._get_user_profile: + self.getUserProfile(callback) except (ValueError, TypeError): Logger.logException("w", "Could not load auth data from preferences")