From 815c26850266eba2e4e5d02509487452624b1c64 Mon Sep 17 00:00:00 2001
From: "kali kaneko (leap communications)" <kali@leap.se>
Date: Tue, 31 Aug 2021 21:59:35 +0200
Subject: [ui] fonts + bugfixing

---
 gui/components/Splash.qml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'gui/components/Splash.qml')

diff --git a/gui/components/Splash.qml b/gui/components/Splash.qml
index b494494..6bdd3ab 100644
--- a/gui/components/Splash.qml
+++ b/gui/components/Splash.qml
@@ -5,6 +5,7 @@ import QtGraphicalEffects 1.0
 Page {
     id: splash
     property int timeoutInterval: 1600
+    property alias errors: splashErrorBox
 
     Column {
         width: parent.width * 0.8
@@ -24,7 +25,13 @@ Page {
             fillMode: Image.PreserveAspectFit
         }
 
-        Spinner {}
+        Spinner {
+            id: splashSpinner
+        }
+
+        InitErrors {
+            id: splashErrorBox
+        }
     }
 
     Timer {
@@ -39,10 +46,10 @@ Page {
     }
 
     function loadMainViewWhenReady() {
-        console.debug("ready?")
+        if (root.error != "") {
+            return
+        }
         if (ctx && ctx.isReady) {
-            console.debug("ready?", ctx.isReady)
-            // FIXME check errors == None
             loader.source = "MainView.qml"
         } else {
             delay(100, loadMainViewWhenReady)
-- 
cgit v1.2.3