aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2019-07-16 11:38:46 -0500
committerluigi1111 <luigi1111w@gmail.com>2019-07-16 11:38:46 -0500
commit39fe5478b91eba08a835739163d7fc05eb2c218d (patch)
tree2d09b0d32096d40b45228027440257c826450341
parentcb3c310eb8df0cd78a2564ada619d7c97dc9efc6 (diff)
parentb96004a101d45dc30114afb1c50bcfbc58c18454 (diff)
downloadmonzero-gui-39fe5478b91eba08a835739163d7fc05eb2c218d.tar.gz
monzero-gui-39fe5478b91eba08a835739163d7fc05eb2c218d.tar.xz
monzero-gui-39fe5478b91eba08a835739163d7fc05eb2c218d.zip
Merge pull request #2287
b96004a main: don't lock on inactivity if passwordDialog is visible (selsta)
-rw-r--r--main.qml1
1 files changed, 1 insertions, 0 deletions
diff --git a/main.qml b/main.qml
index 25536f79..48fde1a9 100644
--- a/main.qml
+++ b/main.qml
@@ -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);