From 20cbbeaf2b49e568a21417d068eb81efb96950bf Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Fri, 21 Apr 2017 20:21:00 +0200
Subject: [PATCH] Fixed #78
---
.../budgetmasterserver/main/Main.java | 39 ++++++++++++-------
1 file changed, 25 insertions(+), 14 deletions(-)
diff --git a/src/de/deadlocker8/budgetmasterserver/main/Main.java b/src/de/deadlocker8/budgetmasterserver/main/Main.java
index a010832b5..a5b8df53e 100644
--- a/src/de/deadlocker8/budgetmasterserver/main/Main.java
+++ b/src/de/deadlocker8/budgetmasterserver/main/Main.java
@@ -4,6 +4,7 @@ import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.nio.file.Files;
+import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Locale;
import java.util.ResourceBundle;
@@ -28,29 +29,39 @@ public class Main
catch(URISyntaxException e1)
{
Logger.error(e1);
- }
+ }
- if(!Files.exists(Paths.get("settings.json")))
+ try
{
+ Path settingsPath = Paths.get(Settings.class.getProtectionDomain().getCodeSource().getLocation().toURI()).resolve("settings.json");
+
+ if(!Files.exists(settingsPath))
+ {
+ try
+ {
+ Files.copy(SparkServer.class.getClassLoader().getResourceAsStream("de/deadlocker8/budgetmasterserver/resources/settings.json"), settingsPath);
+ }
+ catch(IOException e)
+ {
+ Logger.error(e);
+ }
+ }
+
+ Settings settings;
try
{
- Files.copy(SparkServer.class.getClassLoader().getResourceAsStream("de/deadlocker8/budgetmasterserver/resources/settings.json"), Paths.get("settings.json"));
+ settings = Utils.loadSettings();
+ new SparkServer(settings);
}
- catch(IOException e)
+ catch(IOException | URISyntaxException e)
{
Logger.error(e);
}
}
-
- Settings settings;
- try
- {
- settings = Utils.loadSettings();
- new SparkServer(settings);
- }
- catch(IOException | URISyntaxException e)
- {
- Logger.error(e);
+ catch(URISyntaxException e1)
+ {
+ Logger.error(e1);
}
+
}
}
--
GitLab