Merge PR #568: Dont hide splash if autoconnecting

2021-03-22 20:06:28 +01:00 · 2021-03-22 20:06:28 +01:00 · ecc896a676
parent 0a08aeecd2 8d9a60b64c
commit ecc896a676
1 changed files with 4 additions and 1 deletions
--- a/nymea-app/ui/RootItem.qml
+++ b/nymea-app/ui/RootItem.qml
@ -184,9 +184,12 @@ Item {
                        } else if (autoConnectHost.length > 0) {
                            var host = nymeaDiscovery.nymeaHosts.createLanHost(app.systemName, autoConnectHost);
                            engine.jsonRpcClient.connectToHost(host)
+                        } else {
+                            // Only hide the splash right away if we're not trying to connect to something
+                            // If it's not hidden here it will be hidden in 3 seconds or when the connection is up, whichever comes first
+                            PlatformHelper.hideSplashScreen();
                        }

-                        PlatformHelper.hideSplashScreen();
                        pageStack.push(Qt.resolvedUrl("connection/ConnectPage.qml"), StackView.Immediate)
                    }