on xenial help sign in
Fix some usages of 'promptless' that should be 'authenticated'
f6364f7Michael Terry
qml/Shell.qml+5−5
@@ -524,7 +524,7 @@ FocusScope {
524 }
524 }
525
525
526 onPromptlessChanged: {
526 onPromptlessChanged: {
527− if (LightDM.Greeter.promptless) {
527+ if (LightDM.Greeter.promptless && LightDM.Greeter.authenticated) {
528 lockscreen.hide()
528 lockscreen.hide()
529 } else {
529 } else {
530 lockscreen.reset();
530 lockscreen.reset();
@@ -574,7 +574,7 @@ FocusScope {
574 }
574 }
575
575
576 readonly property real showProgress: MathUtils.clamp((1 - x/width) + greeter.showProgress - 1, 0, 1)
576 readonly property real showProgress: MathUtils.clamp((1 - x/width) + greeter.showProgress - 1, 0, 1)
577− onShowProgressChanged: if (LightDM.Greeter.promptless && showProgress === 0) greeter.login()
577+ onShowProgressChanged: if (LightDM.Greeter.authenticated && showProgress === 0) greeter.login()
578
578
579 Greeter {
579 Greeter {
580 id: greeter
580 id: greeter
@@ -611,7 +611,7 @@ FocusScope {
611 if (greeter.narrowMode) {
611 if (greeter.narrowMode) {
612 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
612 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
613 }
613 }
614− if (!LightDM.Greeter.promptless) {
614+ if (!LightDM.Greeter.authenticated) {
615 lockscreen.reset();
615 lockscreen.reset();
616 lockscreen.show();
616 lockscreen.show();
617 }
617 }
@@ -670,7 +670,7 @@ FocusScope {
670 }
670 }
671
671
672 if (LightDM.Greeter.active) {
672 if (LightDM.Greeter.active) {
673− if (!LightDM.Greeter.promptless) {
673+ if (!LightDM.Greeter.authenticated) {
674 lockscreen.show()
674 lockscreen.show()
675 }
675 }
676 greeter.hide()
676 greeter.hide()
@@ -682,7 +682,7 @@ FocusScope {
682 }
682 }
683
683
684 function showDash() {
684 function showDash() {
685− if (LightDM.Greeter.active && !LightDM.Greeter.promptless) {
685+ if (LightDM.Greeter.active && !LightDM.Greeter.authenticated) {
686 return;
686 return;
687 }
687 }
688
688