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

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

Browse Source
This commit is contained in:
Jaime van Kessel 2019-11-11 16:01:19 +01:00
commit 4613b62120
No known key found for this signature in database
GPG Key ID: 3710727397403C91
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/OAuth2/AuthorizationHelpers.py
View File

@ -99,7 +99,7 @@ class AuthorizationHelpers:
}) })
except requests.exceptions.ConnectionError: except requests.exceptions.ConnectionError:
# Connection was suddenly dropped. Nothing we can do about that. # Connection was suddenly dropped. Nothing we can do about that.
Logger.log("w", "Something failed while attempting to parse the JWT token") Logger.logException("w", "Something failed while attempting to parse the JWT token")
return None return None
if token_request.status_code not in (200, 201): if token_request.status_code not in (200, 201):
Logger.log("w", "Could not retrieve token data from auth server: %s", token_request.text) Logger.log("w", "Could not retrieve token data from auth server: %s", token_request.text)

6
resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
View File

@ -174,7 +174,11 @@ Item
} }
onEntered: intentTooltipTimer.start() onEntered: intentTooltipTimer.start()
onExited: base.hideTooltip() onExited:
{
base.hideTooltip()
intentTooltipTimer.stop()
}
} }
NoIntentIcon // This icon has hover priority over intentDescriptionHoverArea, so draw it above it. NoIntentIcon // This icon has hover priority over intentDescriptionHoverArea, so draw it above it.