Merge branch 'dev'

This commit is contained in:
miruka
2020-03-24 16:02:23 -04:00
3 changed files with 12 additions and 10 deletions

View File

@@ -11,8 +11,10 @@ QtObject {
function onAlertRequested() {
if (Qt.application.state !== Qt.ApplicationActive) {
window.alert(window.settings.alertOnMessageForMsec)
const msec = window.settings.alertOnMessageForMsec
if (Qt.application.state !== Qt.ApplicationActive && msec !== 0) {
window.alert(msec === -1 ? 0 : msec) // -1 → 0 = no time out
}
}