From c6d3a74a030252ae85b26e450ed0b5398cf11547 Mon Sep 17 00:00:00 2001
From: Gabriel Tofvesson <gabriel.tofvesson@hotmail.com>
Date: Mon, 14 Nov 2016 19:46:53 +0100
Subject: [PATCH] Minor fix - Launcher no longer loops infinitely when starting

---
 src/Launcher/Main.java        | 19 ++++++++-----------
 src/Launcher/net/Updater.java |  2 +-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/Launcher/Main.java b/src/Launcher/Main.java
index 6448fb4..149a602 100644
--- a/src/Launcher/Main.java
+++ b/src/Launcher/Main.java
@@ -33,7 +33,7 @@ public class Main extends Application {
     // Semantic versioning system data
     public static final String  semVerDevState  = "PreDev";                                                             // Development stage
     public static final int     semVerMajor     = 0;                                                                    // Major version
-    public static final int     semVerMinor     = 2;                                                                    // Minor version
+    public static final int     semVerMinor     = 0;                                                                    // Minor version
     public static final int     semVerPatch     = 1;                                                                    // Patch version
 
     private double xOffset = 0, yOffset = 0;                                                                            // Offsets for dragging
@@ -55,17 +55,14 @@ public class Main extends Application {
             t.getKeyFrames().add(new KeyFrame(Duration.millis(1), event ->{ d.close(); primaryStage.show(); }));
             d.initStyle(StageStyle.UNDECORATED);
             Pane n = (Pane) Tabs.load("dialog_update");
-            //n.getChildren().add(new Label("Hello World"));
             d.setScene(new Scene(n));
             d.show();
-            new Thread(()->{
-                try {
-                    Thread.sleep(1000);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
+            Thread t1 = new Thread(()->{
+                try { Thread.sleep(1000); } catch (InterruptedException e) { e.printStackTrace(); }
                 Updater.getInstance(t);
-            }).start();
+            });
+            t1.setDaemon(true);
+            t1.start();
         }
 
         primaryStage.initStyle(StageStyle.UNDECORATED);                                                                 // Remove ugly trash
@@ -173,9 +170,9 @@ public class Main extends Application {
 
     public static void main(String[] args) throws Exception{
         Main.args = args;
-        if(args.length>0){
+        if (args.length > 0) {
             File f = new File(args[0]);
-            if(f.isFile()) while(!f.delete()) Thread.sleep(50);                                                         // Delete previous jar
+            if (f.isFile()) f.delete();                                                                                 // Delete previous jar
         }
         launch(args);
     }
diff --git a/src/Launcher/net/Updater.java b/src/Launcher/net/Updater.java
index 09213e4..07a0b37 100644
--- a/src/Launcher/net/Updater.java
+++ b/src/Launcher/net/Updater.java
@@ -70,7 +70,6 @@ public class Updater {
                 t.play();
                 return;
             }
-            final int l=semMajor, j=semMinor, k=semPatch;
             File f = new File("TAL-"+semMajor+"_"+semMinor+"_"+semPatch+".jar"), f1;
             if((f1=new File(Main.class.getResource("/assets/").getFile())).getParent().contains("!") &&
                     f1.getParent().contains("file:"))                                                                   // Find .jar representation of this program
@@ -94,6 +93,7 @@ public class Updater {
             while((i=reader.read(buffer))!=-1) o.write(buffer, 0, i);
             reader.close();
             o.close();
+            System.out.println("Starting!");
             Runtime.getRuntime().exec("java -jar "+f.getName()+" "+f1.getAbsolutePath()+" "+false);
             System.exit(0);
         } catch (IOException e) {