3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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
Download patch file Download diff file Expand all files Collapse all files

3
cura/OAuth2/AuthorizationService.py
View file

@ -305,7 +305,8 @@ class AuthorizationService:
message_type = Message.MessageType.ERROR) message_type = Message.MessageType.ERROR)
Logger.warning("Unable to get user profile using auth data from preferences.") Logger.warning("Unable to get user profile using auth data from preferences.")
self._unable_to_get_data_message.show() self._unable_to_get_data_message.show()
self.getUserProfile(callback) if self._get_user_profile:
self.getUserProfile(callback)
except (ValueError, TypeError): except (ValueError, TypeError):
Logger.logException("w", "Could not load auth data from preferences") 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 # Prepare the machine
self._applyChangesToMachine(global_stack, extruder_stack_dict) 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...") Logger.log("d", "Workspace loading is notifying rest of the code of changes...")
# Actually change the active machine. # Actually change the active machine.