GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 06:58:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.7' into CURA-11700-trigger-area-for-selecting-machine

Browse Source
This commit is contained in:
Saumya Jain 2024-03-14 13:40:07 +01:00 committed by GitHub
commit b245cce4e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cura/OAuth2/AuthorizationService.py
View File

@ -305,6 +305,7 @@ 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()
if self._get_user_profile:
self.getUserProfile(callback)
except (ValueError, TypeError):
Logger.logException("w", "Could not load auth data from preferences")

4
plugins/3MFReader/ThreeMFWorkspaceReader.py
View File

@ -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.