From 7a49541d45cb19a7eb7cefa12442b600e63210c2 Mon Sep 17 00:00:00 2001 From: Banks Troutman Date: Thu, 26 Sep 2019 15:01:51 -0400 Subject: [PATCH] Fix settings paths for Unix systems --- .../java/com/chameleonvision/settings/SettingsManager.java | 4 ++-- .../java/com/chameleonvision/vision/camera/CameraManager.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java b/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java index 79b759405..95840fe10 100644 --- a/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java +++ b/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java @@ -14,7 +14,7 @@ import java.nio.file.Path; import java.nio.file.Paths; public class SettingsManager { - public static final Path SettingsPath = Paths.get(System.getProperty("user.dir"), "Settings"); + public static final Path SettingsPath = Paths.get(System.getProperty("user.dir"), "settings"); public static com.chameleonvision.vision.GeneralSettings GeneralSettings; private SettingsManager() {} @@ -79,7 +79,7 @@ public class SettingsManager { private static void initGeneralSettings() { FileHelper.CheckPath(SettingsPath); try { - GeneralSettings = new Gson().fromJson(new FileReader(Paths.get(SettingsPath.toString(), "Settings.json").toString()), com.chameleonvision.vision.GeneralSettings.class); + GeneralSettings = new Gson().fromJson(new FileReader(Paths.get(SettingsPath.toString(), "settings.json").toString()), com.chameleonvision.vision.GeneralSettings.class); } catch (FileNotFoundException e) { GeneralSettings = new GeneralSettings(); } diff --git a/Main/src/main/java/com/chameleonvision/vision/camera/CameraManager.java b/Main/src/main/java/com/chameleonvision/vision/camera/CameraManager.java index 03f1a8f53..098ecf457 100644 --- a/Main/src/main/java/com/chameleonvision/vision/camera/CameraManager.java +++ b/Main/src/main/java/com/chameleonvision/vision/camera/CameraManager.java @@ -19,7 +19,7 @@ import java.util.List; public class CameraManager { - private static final Path CamConfigPath = Paths.get(SettingsManager.SettingsPath.toString(), "Cams"); + private static final Path CamConfigPath = Paths.get(SettingsManager.SettingsPath.toString(), "cameras"); private static HashMap AllCamerasByName = new HashMap<>();