Merge pull request #2287

b96004a main: don't lock on inactivity if passwordDialog is visible (selsta)
pull/2/head
luigi1111 5 years ago
commit 39fe5478b9
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010

@ -2198,6 +2198,7 @@ ApplicationWindow {
function checkInUserActivity() {
if(rootItem.state !== "normal") return;
if(!persistentSettings.lockOnUserInActivity) return;
if(passwordDialog.visible) return;
// prompt password after X seconds of inactivity
var epoch = Math.floor((new Date).getTime() / 1000);