From 67d007bb315b99e39eeb408216f7a1d72fd2a6a7 Mon Sep 17 00:00:00 2001
From: Elias Fierke <fierke@mypapertown.de>
Date: Mon, 18 May 2026 11:36:59 +0200
Subject: [PATCH] [fix:] inconsistency with config.json

---
 DataStore/Settings.cs | 25 ++++++++++++++-----------
 MainWindow.axaml      |  2 +-
 MainWindow.axaml.cs   |  4 ++--
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/DataStore/Settings.cs b/DataStore/Settings.cs
index 0c3f50c..cee3058 100644
--- a/DataStore/Settings.cs
+++ b/DataStore/Settings.cs
@@ -12,8 +12,8 @@ public class Settings
     public Customers customers = new();
     public PdfExportSettings pdfExport { get; set; } = new();
 
-    public string settingsPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-        "logofclient", "config.json");
+    // public string settingsPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+    //     "logofclient", "config.json");
 
     public Settings()
     {
@@ -23,23 +23,22 @@ public class Settings
 
     public static void Save()
     {
-        if (!Directory.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-                "logofclient")))
+        if (!Directory.Exists(Global._instance.config_path))
             Directory.CreateDirectory(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
                 "logofclient"));
-        if (!string.IsNullOrEmpty(Global._instance.config_path)) _instance.settingsPath = Global._instance.config_path;
+        // if (!string.IsNullOrEmpty(Global._instance.config_path)) _instance.settingsPath = Global._instance.config_path;
 
         var json = JsonConvert.SerializeObject(_instance);
-        File.WriteAllText(_instance.settingsPath, json);
+        File.WriteAllText(Path.Combine(Global._instance.config_path,"config.json"), json);
     }
 
     public static void Load()
     {
-        if (!string.IsNullOrEmpty(Global._instance.config_path)) _instance.settingsPath = Global._instance.config_path;
+        //if (!string.IsNullOrEmpty(Global._instance.config_path)) _instance.settingsPath = Global._instance.config_path;
 
         try
         {
-            var contents = File.ReadAllText(_instance.settingsPath);
+            var contents = File.ReadAllText(Path.Combine(Global._instance.config_path, "config.json"));
             _instance = JsonConvert.DeserializeObject<Settings>(contents);
             MainWindow._instance.RefreshCustomerItems();
         }
@@ -80,11 +79,15 @@ public class Global
         _instance = this;
     }
 
-    public string config_path { get; set; } = Path.Combine(
+    public string config_path { get; } = Path.Combine(
         Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-        "logofclient",
-        "config.json");
+        "logofclient");
 
+    public void SetConfigPath(string path)
+    {
+        Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData));
+    }
     public string wiki_storage_path { get; set; } = Path.Combine(
         Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
         "logofclient",
diff --git a/MainWindow.axaml b/MainWindow.axaml
index ec71c2c..792dc50 100644
--- a/MainWindow.axaml
+++ b/MainWindow.axaml
@@ -389,7 +389,7 @@
                                     <StackPanel Grid.Column="1" Orientation="Vertical" Spacing="5">
                                         <StackPanel Orientation="Horizontal" Spacing="5">
                                             <TextBox x:Name="TbConfigPath" HorizontalAlignment="Stretch"
-                                                     Watermark="/home/username/.config/logofclient/config.json" />
+                                                     Watermark="/home/username/.config/logofclient/" />
                                             <Button x:Name="BtnConfigPath" HorizontalAlignment="Right">
                                                 <Button.Content>
                                                     <StackPanel Orientation="Horizontal">
diff --git a/MainWindow.axaml.cs b/MainWindow.axaml.cs
index 34de03e..f3581f3 100644
--- a/MainWindow.axaml.cs
+++ b/MainWindow.axaml.cs
@@ -401,8 +401,8 @@ public partial class MainWindow : Window
 
         if (folder == null || folder.Count == 0) return;
         var chosen = folder[0].Path;
-        TbConfigPath.Text = chosen.ToString();
-        Global._instance.config_path = chosen.ToString();
+        Global._instance.SetConfigPath(chosen.ToString());
+        TbConfigPath.Text = Global._instance.config_path;
         Global.Save();
 
         MessageBox.Show(this, "Bitte starten Sie das Programm neu, um die Änderungen wirksam zu machen.", "Achtung");