diff --git a/libnymea-app-core/engine.cpp b/libnymea-app-core/engine.cpp index 1e378069..7d244926 100644 --- a/libnymea-app-core/engine.cpp +++ b/libnymea-app-core/engine.cpp @@ -136,9 +136,6 @@ void Engine::onConnectedChanged() qDebug() << "Engine: inital setup required:" << m_jsonRpcClient->initialSetupRequired() << "auth required:" << m_jsonRpcClient->authenticationRequired(); if (!m_jsonRpcClient->initialSetupRequired() && !m_jsonRpcClient->authenticationRequired()) { m_deviceManager->init(); - m_ruleManager->init(); - m_nymeaConfiguration->init(); - m_systemController->init(); } } } @@ -146,6 +143,9 @@ void Engine::onConnectedChanged() void Engine::onDeviceManagerFetchingChanged() { if (!m_deviceManager->fetchingData()) { + m_ruleManager->init(); + m_nymeaConfiguration->init(); + m_systemController->init(); if (m_jsonRpcClient->ensureServerVersion("1.7")) { m_tagsManager->init(); } diff --git a/nymea-app/ui/MainPage.qml b/nymea-app/ui/MainPage.qml index 912c861e..413b0278 100644 --- a/nymea-app/ui/MainPage.qml +++ b/nymea-app/ui/MainPage.qml @@ -306,7 +306,7 @@ Page { EmptyViewPlaceholder { anchors { left: parent.left; right: parent.right; margins: app.margins } anchors.verticalCenter: parent.verticalCenter - visible: groupsView.count == 0 + visible: groupsView.count == 0 && !engine.deviceManager.fetchingData && !engine.tagsManager.busy title: qsTr("There are no groups set up yet.") text: qsTr("Grouping things can be useful to control multiple devices at once, for example an entire room. Watch out for the group symbol when interacting with things and use it to add them to groups.") imageSource: "images/view-grid-symbolic.svg"