mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-06 13:34:01 -06:00
Merge branch '4.4' of github.com:Ultimaker/Cura
This commit is contained in:
commit
4613b62120
2 changed files with 6 additions and 2 deletions
|
@ -99,7 +99,7 @@ class AuthorizationHelpers:
|
|||
})
|
||||
except requests.exceptions.ConnectionError:
|
||||
# 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
|
||||
if token_request.status_code not in (200, 201):
|
||||
Logger.log("w", "Could not retrieve token data from auth server: %s", token_request.text)
|
||||
|
|
|
@ -174,7 +174,11 @@ Item
|
|||
}
|
||||
|
||||
onEntered: intentTooltipTimer.start()
|
||||
onExited: base.hideTooltip()
|
||||
onExited:
|
||||
{
|
||||
base.hideTooltip()
|
||||
intentTooltipTimer.stop()
|
||||
}
|
||||
}
|
||||
|
||||
NoIntentIcon // This icon has hover priority over intentDescriptionHoverArea, so draw it above it.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue