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

Merge branch '4.11' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2021-08-12 11:15:38 +02:00
commit b60ae92d60
59 changed files with 11246 additions and 8710 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/OAuth2/KeyringAttribute.py
View file

@ -43,6 +43,10 @@ class KeyringAttribute:
self._store_secure = False
Logger.log("i", "Access to the keyring was denied.")
return getattr(instance, self._name)
except UnicodeDecodeError:
self._store_secure = False
Logger.log("w", "The password retrieved from the keyring cannot be used because it contains characters that cannot be decoded.")
return getattr(instance, self._name)
else:
return getattr(instance, self._name)