From 7da58c7dbedf840b1e98cf3be3c31be330382457 Mon Sep 17 00:00:00 2001 From: CodeSteak Date: Fri, 14 Jun 2019 11:28:43 +0200 Subject: [PATCH] Fix #42, dont load IP from File, if auto-connected --- .../org/hso/texturesyncclient/controller/RootController.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/client/src/main/kotlin/org/hso/texturesyncclient/controller/RootController.kt b/client/src/main/kotlin/org/hso/texturesyncclient/controller/RootController.kt index dea6191..64b473d 100644 --- a/client/src/main/kotlin/org/hso/texturesyncclient/controller/RootController.kt +++ b/client/src/main/kotlin/org/hso/texturesyncclient/controller/RootController.kt @@ -103,6 +103,8 @@ class RootController : Controller() { println("[auto] Connection to Server successful") switchStartupToMain() showAll() + + return // abort } else { println("[auto] no server found") } @@ -119,6 +121,8 @@ class RootController : Controller() { println("[file] Connection to Server successful") switchStartupToMain() showAll() + + return // abort } catch (e: Exception) { println(e) println("[file] Connection to Server NOT successful") @@ -137,6 +141,8 @@ class RootController : Controller() { switchStartupToMain() showAll() println("swithing to MainView @ initCon") + + return // abort } catch (e: Exception) { println(e) println("Connection to Server NOT successful")