From 83db694c1be526dd25ce7424ddd528b0fc07acf0 Mon Sep 17 00:00:00 2001
From: Marco van den Oever <marco@flyingpie.nl>
Date: Wed, 17 Jan 2024 22:09:55 +0100
Subject: [PATCH] WinGet release preperation (#117)

* WinGet release preperation

* Workspace
---
 windows-terminal-quake/Native/TerminalProcess.cs | 5 ++++-
 windows-terminal-quake/Settings/QSettings.cs     | 2 ++
 windows-terminal-quake/Settings/SettingsDto.cs   | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/windows-terminal-quake/Native/TerminalProcess.cs b/windows-terminal-quake/Native/TerminalProcess.cs
index 5dbba04..e8c4bfb 100644
--- a/windows-terminal-quake/Native/TerminalProcess.cs
+++ b/windows-terminal-quake/Native/TerminalProcess.cs
@@ -33,7 +33,10 @@ public static Process Get(string[] args)
 				TimeSpan.FromMilliseconds(50),
 				TimeSpan.FromMilliseconds(100),
 				TimeSpan.FromMilliseconds(250),
-				TimeSpan.FromMilliseconds(500)
+				TimeSpan.FromMilliseconds(500),
+				TimeSpan.FromMilliseconds(1000),
+				TimeSpan.FromMilliseconds(2000),
+				TimeSpan.FromMilliseconds(5000),
 			},
 			onRetry: (ex, t) => Log.Error($"Error creating process: '{ex.Message}'"));
 
diff --git a/windows-terminal-quake/Settings/QSettings.cs b/windows-terminal-quake/Settings/QSettings.cs
index 676005c..5eb92e9 100644
--- a/windows-terminal-quake/Settings/QSettings.cs
+++ b/windows-terminal-quake/Settings/QSettings.cs
@@ -4,6 +4,8 @@ namespace WindowsTerminalQuake.Settings;
 
 public class QSettings
 {
+	public static readonly string DefaultPathToSettingsFile = Path.Combine(Path.GetDirectoryName(new Uri(typeof(QSettings).Assembly.Location).LocalPath), SettingsFileNameWithoutExtension + ".json");
+
 	public static readonly string[] PathsToSettingsDirs = new[]
 	{
 		// C:/path/to/windows-terminal-quake.json
diff --git a/windows-terminal-quake/Settings/SettingsDto.cs b/windows-terminal-quake/Settings/SettingsDto.cs
index 6eb3119..41f68a3 100644
--- a/windows-terminal-quake/Settings/SettingsDto.cs
+++ b/windows-terminal-quake/Settings/SettingsDto.cs
@@ -51,7 +51,7 @@ public class SettingsDto
 	/// <para>The keys that can be used to toggle the terminal.</para>
 	/// <para>See "Hotkeys" for possible values.</para>
 	/// </summary>
-	public IReadOnlyCollection<Hotkey>? Hotkeys { get; set; }
+	public IReadOnlyCollection<Hotkey>? Hotkeys { get; set; } = Array.Empty<Hotkey>();
 
 	/// <summary>
 	/// <para>Minimum level of events that are logged.</para>
@@ -167,7 +167,7 @@ public class SettingsDto
 	/// The location of the file where the current settings were loaded from.
 	/// Can be null if these are defaults.
 	/// </summary>
-	internal string? PathToSettings { get; set; }
+	internal string PathToSettings { get; set; } = QSettings.DefaultPathToSettingsFile;
 
 	/// <summary>
 	/// Vertical screen coverage as an index (0 - 1).