From 7ce840de67a4646e15068913c2c1d02d2286ec50 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Tue, 3 Jul 2018 20:51:55 +0200
Subject: [PATCH] fix initializing of main view

---
 nymea-app/ui/MainPage.qml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/nymea-app/ui/MainPage.qml b/nymea-app/ui/MainPage.qml
index a8eb227d..bb56ae2c 100644
--- a/nymea-app/ui/MainPage.qml
+++ b/nymea-app/ui/MainPage.qml
@@ -78,17 +78,21 @@ Page {
                 id: swipeView
                 clip: true
                 anchors.fill: parent
-                currentIndex: settings.currentMainViewIndex
-                onCurrentIndexChanged: settings.currentMainViewIndex = currentIndex
                 opacity: Engine.deviceManager.fetchingData ? 0 : 1
                 Behavior on opacity { NumberAnimation { duration: 300 } }
 
+                onCurrentIndexChanged: {
+                    settings.currentMainViewIndex = currentIndex
+                }
+
                 Component.onCompleted:  {
                     if (Engine.jsonRpcClient.ensureServerVersion(1.6)) {
                         swipeView.insertItem(0, favoritesViewComponent.createObject(swipeView))
-                    } else if (settings.currentMainViewIndex === 2) {
-                        settings.currentMainViewIndex = 0;
                     }
+                    if (settings.currentMainViewIndex > swipeView.count) {
+                        settings.currentMainViewIndex = swipeView.count - 1;
+                    }
+                    swipeView.currentIndex = Qt.binding(function() { return settings.currentMainViewIndex; })
                 }
 
                 Component {