From 42cb9bc7f44d41e18d7dd3c1ee220e26320cc757 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Thu, 23 Mar 2017 10:21:16 +0100
Subject: [PATCH] fix(ui/views/App/Main/MainWindow): avoid crash

---
 linphone-desktop/src/components/core/CoreManager.hpp   |  6 ------
 linphone-desktop/ui/views/App/Main/MainWindow.qml      | 10 +++++++---
 .../ui/views/App/SplashScreen/SplashScreen.qml         |  8 ++++++++
 3 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 linphone-desktop/ui/views/App/SplashScreen/SplashScreen.qml

diff --git a/linphone-desktop/src/components/core/CoreManager.hpp b/linphone-desktop/src/components/core/CoreManager.hpp
index 7f1699ecd..449a10b02 100644
--- a/linphone-desktop/src/components/core/CoreManager.hpp
+++ b/linphone-desktop/src/components/core/CoreManager.hpp
@@ -41,8 +41,6 @@ class QTimer;
 class CoreManager : public QObject {
   Q_OBJECT;
 
-  Q_PROPERTY(bool linphoneCoreCreated READ getLinphoneCoreCreated NOTIFY linphoneCoreCreated);
-
 public:
   ~CoreManager () = default;
 
@@ -118,10 +116,6 @@ private:
 
   void createLinphoneCore (const QString &config_path);
 
-  bool getLinphoneCoreCreated () {
-    return m_promise_build.isFinished();
-  }
-
   std::shared_ptr<linphone::Core> m_core;
   std::shared_ptr<CoreHandlers> m_handlers;
 
diff --git a/linphone-desktop/ui/views/App/Main/MainWindow.qml b/linphone-desktop/ui/views/App/Main/MainWindow.qml
index 6a54c279a..cfb4a542c 100644
--- a/linphone-desktop/ui/views/App/Main/MainWindow.qml
+++ b/linphone-desktop/ui/views/App/Main/MainWindow.qml
@@ -57,6 +57,11 @@ ApplicationWindow {
 
   // ---------------------------------------------------------------------------
 
+  Connections {
+    target: CoreManager
+    onLinphoneCoreCreated: mainLoader.active = true
+  }
+
   Shortcut {
     sequence: StandardKey.Close
     onActivated: window.hide()
@@ -67,12 +72,11 @@ ApplicationWindow {
   Loader {
     id: mainLoader
 
-    active: CoreManager.linphoneCoreCreated
+    active: false
     anchors.fill: parent
 
     sourceComponent: ColumnLayout {
       // Workaround to get these properties in `MainWindow.js`.
-      // TODO: Find better Workaround.
       readonly property alias collapse: collapse
       readonly property alias contentLoader: contentLoader
       readonly property alias menu: menu
@@ -252,6 +256,6 @@ ApplicationWindow {
     height: MainWindowStyle.toolBar.height
     width: MainWindowStyle.toolBar.leftMargin
 
-    onClicked: CoreManager.linphoneCoreCreated && CoreManager.forceRefreshRegisters()
+    onClicked: CoreManager.forceRefreshRegisters()
   }
 }
diff --git a/linphone-desktop/ui/views/App/SplashScreen/SplashScreen.qml b/linphone-desktop/ui/views/App/SplashScreen/SplashScreen.qml
new file mode 100644
index 000000000..158b23f5f
--- /dev/null
+++ b/linphone-desktop/ui/views/App/SplashScreen/SplashScreen.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.7
+import QtQuick.Window 2.2
+
+// =============================================================================
+
+Window {
+
+}