Merge pull request #108 from ChrisFeline/dev

Dev
ChrisFeline · Dec 27, 2024 · 240a961 · 240a961
2 parents d209083 + 98baa35
commit 240a961
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
@@ -2,7 +2,7 @@ name: .NET Core Desktop
 
 on:
   push:
-    branches: [ "main", "dev" ]
+    branches: [ "main", "dev", "test" ]
     paths-ignore:
       - '**.md'  # Ignore markdown files
       - '**.png' # Ignore image files

diff --git a/Logger.cs b/Logger.cs
@@ -35,7 +35,7 @@ internal static class Logger {
 
         private static readonly StreamWriter LogFileWriter;
         static Logger () {
-            LogFileWriter = new StreamWriter("output.log", append: false);
+            LogFileWriter = new StreamWriter(Path.Combine(Program.DataLocation, "output.log"), append: false);
         }
 
         internal static void Log(string? message, LogType logType = LogType.Log) {

diff --git a/Program.cs b/Program.cs
@@ -49,9 +49,16 @@ internal static bool ContainsArg(string arg) {
         [STAThread]
         static void Main(string[] args)
         {
-            Directory.SetCurrentDirectory(ProgramDirectory);
             Logger.Log("Initializing logging.");
 
+            try {
+                Directory.SetCurrentDirectory(ProgramDirectory);
+                Logger.Log("Program Directory: " + ProgramDirectory);
+            } catch (Exception e) {
+                Logger.Error("Failed to set Program Directory to: " + ProgramDirectory);
+                Logger.Error(e.ToString());
+            }
+
             Arguments = args;
             CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture;
             CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.InvariantCulture;