From ef25bcd7bf77e8cab3fcc63292ec0343c2242861 Mon Sep 17 00:00:00 2001
From: alterNERDtive <nerd@alternerd.tv>
Date: Fri, 24 Dec 2021 17:48:28 +0100
Subject: [PATCH] =?UTF-8?q?Added=20support=20for=20Odyssey=E2=80=99s=20new?=
 =?UTF-8?q?=20`StartPreset.4.start`=20file?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fixes #29
---
 CHANGELOG.md | 14 +++++++++++++-
 README.md    | 38 +++++++++++++++++++-------------------
 bindED.cs    | 10 +++++++---
 3 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10ebb86..a354050 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,14 @@
-# 4.2 (2021-08-13)
+# 4.2.1 (2021-12-24)
+
+## Fixed
+
+* Added support for Odyssey’s new `StartPreset.4.start` file; the preset
+  selected in the Odyssey client will take precedence, so make sure you use the
+  same preset for Horizons (#29).
+
+-----
+
+# 4.2 (2021-08-13)
 
 ## Added
 
@@ -16,6 +26,8 @@
 
 * Now correctly loads presets that contain regex special characters (#28).
 
+-----
+
 # 4.1 (2021-05-22)
 
 ## Added
diff --git a/README.md b/README.md
index aa71b8c..1790587 100644
--- a/README.md
+++ b/README.md
@@ -1,27 +1,27 @@
-# bindED
-
-This VoiceAttack plugin reads keybindings in Elite:Dangerous and stores them as
-VoiceAttack variables. It was originally written by Gary (the developer of
-VoiceAttack) [and published on the VoiceAttack
-forums](https://forum.voiceattack.com/smf/index.php?topic=564.0). You can find
-the [original README here](https://alterNERDtive.github.io/bindED/ReadMe.txt)
-for reference.
-
-I have basically done a complete rewrite of the original source code at this point
-and added a lot of features including automatic detection of the correct
-bindings file and support for non-US keyboard layouts (see below for details).
+# bindED
+
+This VoiceAttack plugin reads keybindings in Elite:Dangerous and stores them as
+VoiceAttack variables. It was originally written by Gary (the developer of
+VoiceAttack) [and published on the VoiceAttack
+forums](https://forum.voiceattack.com/smf/index.php?topic=564.0). You can find
+the [original README here](https://alterNERDtive.github.io/bindED/ReadMe.txt)
+for reference.
+
+I have basically done a complete rewrite of the original source code at this point
+and added a lot of features including automatic detection of the correct
+bindings file and support for non-US keyboard layouts (see below for details).
 
 ## Documentation & Installation Guide
 
 You can find [comprehensive documentation on Github
 Pages](https://alterNERDtive.github.io/bindED).
-
+
 ## Need Help / Want to Contribute?
 
-Have a look at [the troubleshooting
-guide](https://alterNERDtive.github.io/bindED/troubleshooting). If your problem
-persists, please [file an
-issue](https://github.com/alterNERDtive/bindED/issues/new). Thanks! :)
-
-You can also [say “Hi” on Discord](https://discord.gg/YeXh2s5UC6) if that is
+Have a look at [the troubleshooting
+guide](https://alterNERDtive.github.io/bindED/troubleshooting). If your problem
+persists, please [file an
+issue](https://github.com/alterNERDtive/bindED/issues/new). Thanks! :)
+
+You can also [say “Hi” on Discord](https://discord.gg/YeXh2s5UC6) if that is
 your thing.
diff --git a/bindED.cs b/bindED.cs
index 87d3359..a851ef3 100644
--- a/bindED.cs
+++ b/bindED.cs
@@ -90,7 +90,7 @@ private static Dictionary<string, List<string>>? Binds
         }
         private static Dictionary<string, List<string>>? _binds;
 
-        public static string VERSION = "4.2";
+        public static string VERSION = "4.2.1";
 
         public static string VA_DisplayName() => $"bindED Plugin v{VERSION}-alterNERDtive";
 
@@ -294,10 +294,14 @@ private static Dictionary<String, int> LoadKeyMap(string layout)
 
         private static string DetectPreset()
         {
-            string startFile = Path.Combine(_bindingsDir, "StartPreset.start");
+            string startFile = Path.Combine(_bindingsDir, "StartPreset.4.start");
             if (!File.Exists(startFile))
             {
-                throw new FileNotFoundException("No 'StartPreset.start' file found. Please run Elite: Dangerous at least once, then restart VoiceAttack.");
+                startFile = Path.Combine(_bindingsDir, "StartPreset.start");
+                if (!File.Exists(startFile))
+                {
+                    throw new FileNotFoundException("No 'StartPreset.start' file found. Please run Elite: Dangerous at least once, then restart VoiceAttack.");
+                }
             }
 
             IEnumerable<string> presets = File.ReadAllLines(startFile).Distinct();