From 7a128f6d9c87fea617d4846b5b939dafbe3feb0d Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Wed, 25 Oct 2017 17:11:59 +0200
Subject: Return to the mailview when popping all views off

---
 components/kube/contents/ui/Kube.qml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'components')

diff --git a/components/kube/contents/ui/Kube.qml b/components/kube/contents/ui/Kube.qml
index c0aaad48..8839c78b 100644
--- a/components/kube/contents/ui/Kube.qml
+++ b/components/kube/contents/ui/Kube.qml
@@ -270,7 +270,12 @@ Controls2.ApplicationWindow {
             Kube.Listener {
                 filter: Kube.Messages.componentDone
                 onMessageReceived: {
-                    kubeViews.pop(Controls2.StackView.Immediate)
+                    //Return to the mailview if we try to pop everything off
+                    if (kubeViews.depth == 1) {
+                        kubeViews.setMailView()
+                    } else {
+                        kubeViews.pop(Controls2.StackView.Immediate)
+                    }
                     kubeViews.loginIfNecessary()
                 }
             }
-- 
cgit v1.2.3