From 6bf7812f7b3c212204799b79127299887e3a909c Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Fri, 4 Jul 2014 13:14:40 +0200
Subject: [PATCH] Clear shutdown button selection when returning to main view

---
 lookandfeel/contents/loginmanager/Main.qml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lookandfeel/contents/loginmanager/Main.qml b/lookandfeel/contents/loginmanager/Main.qml
index 12557e70e..31423628c 100644
--- a/lookandfeel/contents/loginmanager/Main.qml
+++ b/lookandfeel/contents/loginmanager/Main.qml
@@ -134,7 +134,12 @@ Image {
                     }
 
                     onModeChanged: {
-                        stackView.push(logoutScreenComponent, {"mode": mode})
+                        if (mode) {
+                            stackView.push(logoutScreenComponent, {"mode": mode})
+                        }
+                    }
+                    onVisibleChanged: if(visible) {
+                        mode = ""
                     }
                 }
 
@@ -155,7 +160,9 @@ Image {
             Component {
                 id: logoutScreenComponent
                 LogoutScreen {
-                    onCancel: stackView.pop()
+                    onCancel: {
+                        stackView.pop()
+                    }
 
                     onShutdownRequested: {
                         sddm.powerOff()