From 7430e3dbeb185591117c88600c36bd65af677438 Mon Sep 17 00:00:00 2001
From: Gabriel Tofvesson <gabriel.tofvesson@hotmail.com>
Date: Sun, 13 Nov 2016 13:39:20 +0100
Subject: [PATCH] Settings tabs stuff

---
 src/Launcher/Main.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Launcher/Main.java b/src/Launcher/Main.java
index 14e57b0..7945f58 100644
--- a/src/Launcher/Main.java
+++ b/src/Launcher/Main.java
@@ -105,9 +105,11 @@ public class Main extends Application {
                 updateTabSelection(Settings_btn, TabType.MAIN);
                 Node n = Tabs.switchTab("settings", tab);                                                               // Sets the active tab to the settings tab unless it's already active
 
-                (settings_activeTab=n.lookup("#Settings-Gen-btn")).setOnMouseClicked(event1 -> {
+                if(settings_activeTab==null) settings_activeTab = n.lookup("#Settings-Gen-btn");                        // First time stuff
+
+                n.lookup("#Settings-Gen-btn").setOnMouseClicked(event1 -> {
                     // Generic Settings Sub-tab
-                    if(!settings_activeTab.getId().equals(n.lookup("#Settings-Gen-btn").getId())){
+                    if(!settings_activeTab.getId().equals(n.lookup("#Settings-Gen-btn").getId())){                      // Use id to identify layouts
                         updateTabSelection(n.lookup("#Settings-Gen-btn"), TabType.SETTINGS);
                         Node genericLayout = Tabs.switchTab("settings_generic", (Pane) n.lookup("#Settings-Pane"));
 
@@ -117,7 +119,7 @@ public class Main extends Application {
 
                 n.lookup("#Settings-Mine-btn").setOnMouseClicked(event1 -> {
                     // Minecraft Settings Sub-tab
-                    if(!settings_activeTab.getId().equals(n.lookup("#Settings-Mine-btn").getId())){
+                    if(!settings_activeTab.getId().equals(n.lookup("#Settings-Mine-btn").getId())){                     // Use id to identify layouts
                         updateTabSelection(n.lookup("#Settings-Mine-btn"), TabType.SETTINGS);
                         Node minecraftLayout = Tabs.switchTab("settings_minecraft", (Pane) n.lookup("#Settings-Pane"));
 
@@ -125,7 +127,7 @@ public class Main extends Application {
                     }
                 });
 
-                Tabs.switchTab("settings_generic", (Pane) n.lookup("#Settings-Pane"));
+                Tabs.switchTab(settings_activeTab.getId().equals("#Settings-Gen-btn")?"settings_generic":"settings_minecraft", (Pane) n.lookup("#Settings-Pane"));
             }
         });