From 7e3ce9ce569c4063939e985c5d21af53f396da0f Mon Sep 17 00:00:00 2001
From: Seil0 <seil0@mosad.xyz>
Date: Mon, 10 Jun 2019 15:30:00 +0200
Subject: [PATCH] fixed StartupViewController is created twice

closes #27
---
 .../src/main/kotlin/org/hso/texturesyncclient/app/Main.kt   | 6 +++++-
 .../view/startupView/StartupViewController.kt               | 4 +---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/client/src/main/kotlin/org/hso/texturesyncclient/app/Main.kt b/client/src/main/kotlin/org/hso/texturesyncclient/app/Main.kt
index eeb7a16..4314048 100644
--- a/client/src/main/kotlin/org/hso/texturesyncclient/app/Main.kt
+++ b/client/src/main/kotlin/org/hso/texturesyncclient/app/Main.kt
@@ -2,6 +2,7 @@ package org.hso.texturesyncclient.app
 
 import javafx.scene.image.Image
 import javafx.stage.Stage
+import org.hso.texturesyncclient.controller.SettingsController
 import org.hso.texturesyncclient.view.startupView.StartupView
 import org.hso.texturesyncclient.view.startupView.StartupViewController
 import tornadofx.App
@@ -9,7 +10,7 @@ import tornadofx.App
 class Main: App(StartupView::class){
 
     //start first controller
-    private val svc = StartupViewController()
+    private val svc: StartupViewController by inject()
 
     override fun start(stage: Stage) {
 
@@ -23,6 +24,9 @@ class Main: App(StartupView::class){
 
         super.start(stage)
         stage.scene.stylesheets.add("/css/Styles.css") // this call must be after the super call
+
+        SettingsController.init()
+        svc.initConnection()
     }
 
 }
\ No newline at end of file
diff --git a/client/src/main/kotlin/org/hso/texturesyncclient/view/startupView/StartupViewController.kt b/client/src/main/kotlin/org/hso/texturesyncclient/view/startupView/StartupViewController.kt
index 6da18ba..72595fb 100644
--- a/client/src/main/kotlin/org/hso/texturesyncclient/view/startupView/StartupViewController.kt
+++ b/client/src/main/kotlin/org/hso/texturesyncclient/view/startupView/StartupViewController.kt
@@ -1,7 +1,6 @@
 package org.hso.texturesyncclient.view.startupView
 
 import org.hso.texturesyncclient.controller.RootController
-import org.hso.texturesyncclient.controller.SettingsController
 import tornadofx.Controller
 
 
@@ -10,9 +9,8 @@ class StartupViewController : Controller() {
     private val sv = find(StartupView::class)
     private val rootc = find(RootController::class)
 
-    init {
+    fun initConnection() {
         println("init StartupViewController")
-        SettingsController.init()
         startConnectionUI()
         runAsync {
             rootc.initConnection(" ")