From 9e8d46fb03054cfe0d42cfa2c20b08d55e8888ba Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Sun, 1 Jun 2025 20:49:30 -0400
Subject: [PATCH] Fix Redump default options (fixes #855)

---
 CHANGELIST.md                                      | 1 +
 MPF.ExecutionContexts.Test/RedumperTests.cs        | 1 -
 MPF.ExecutionContexts/Redumper/ExecutionContext.cs | 5 -----
 MPF.ExecutionContexts/Redumper/SettingConstants.cs | 5 +----
 MPF.Frontend/Options.cs                            | 9 ---------
 MPF.UI/Windows/OptionsWindow.xaml                  | 6 +-----
 6 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/CHANGELIST.md b/CHANGELIST.md
index 9aee9673..bfb5189a 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -6,6 +6,7 @@
 - Fix issues with last commit
 - Update tooltips/labels for controversial options
 - Add currently-hidden RetrieveMatchInformation option
+- Fix Redump default options
 
 ### 3.3.1 (2025-05-23)
 
diff --git a/MPF.ExecutionContexts.Test/RedumperTests.cs b/MPF.ExecutionContexts.Test/RedumperTests.cs
index 3f65df90..cbf37f3a 100644
--- a/MPF.ExecutionContexts.Test/RedumperTests.cs
+++ b/MPF.ExecutionContexts.Test/RedumperTests.cs
@@ -32,7 +32,6 @@ namespace MPF.ExecutionContexts.Test
 
         private static Dictionary<string, string?> AllOptions = new()
         {
-            [SettingConstants.EnableDebug] = "true",
             [SettingConstants.EnableVerbose] = "true",
             [SettingConstants.LeadinRetryCount] = "1000",
             [SettingConstants.ReadMethod] = "BE",
diff --git a/MPF.ExecutionContexts/Redumper/ExecutionContext.cs b/MPF.ExecutionContexts/Redumper/ExecutionContext.cs
index 2fa30eda..06a990ec 100644
--- a/MPF.ExecutionContexts/Redumper/ExecutionContext.cs
+++ b/MPF.ExecutionContexts/Redumper/ExecutionContext.cs
@@ -344,11 +344,6 @@ namespace MPF.ExecutionContexts.Redumper
                         break;
                 }
             }
-            if (GetBooleanSetting(options, SettingConstants.EnableDebug, SettingConstants.EnableDebugDefault))
-            {
-                this[FlagStrings.Debug] = true;
-                (_inputs[FlagStrings.Debug] as FlagInput)?.SetValue(true);
-            }
 
             string? readMethod = GetStringSetting(options, SettingConstants.ReadMethod, SettingConstants.ReadMethodDefault);
 
diff --git a/MPF.ExecutionContexts/Redumper/SettingConstants.cs b/MPF.ExecutionContexts/Redumper/SettingConstants.cs
index 1dffd5c5..bc2cf72d 100644
--- a/MPF.ExecutionContexts/Redumper/SettingConstants.cs
+++ b/MPF.ExecutionContexts/Redumper/SettingConstants.cs
@@ -5,14 +5,11 @@ namespace MPF.ExecutionContexts.Redumper
         public const string DriveType = "RedumperDriveType";
         public static readonly string DriveTypeDefault = Redumper.DriveType.NONE.ToString();
 
-        public const string EnableDebug = "RedumperEnableDebug";
-        public const bool EnableDebugDefault = false;
-
         public const string EnableSkeleton = "RedumperEnableSkeleton";
         public const bool EnableSkeletonDefault = true;
 
         public const string EnableVerbose = "RedumperEnableVerbose";
-        public const bool EnableVerboseDefault = true;
+        public const bool EnableVerboseDefault = false;
 
         public const string LeadinRetryCount = "RedumperLeadinRetryCount";
         public const int LeadinRetryCountDefault = 4;
diff --git a/MPF.Frontend/Options.cs b/MPF.Frontend/Options.cs
index c01c7761..8101d107 100644
--- a/MPF.Frontend/Options.cs
+++ b/MPF.Frontend/Options.cs
@@ -333,15 +333,6 @@ namespace MPF.Frontend
 
         #region Redumper
 
-        /// <summary>
-        /// Enable debug output while dumping by default
-        /// </summary>
-        public bool RedumperEnableDebug
-        {
-            get { return GetBooleanSetting(Settings, RedumperSettings.EnableDebug, RedumperSettings.EnableDebugDefault); }
-            set { Settings[RedumperSettings.EnableDebug] = value.ToString(); }
-        }
-
         /// <summary>
         /// Enable skeleton output while dumping by default
         /// </summary>
diff --git a/MPF.UI/Windows/OptionsWindow.xaml b/MPF.UI/Windows/OptionsWindow.xaml
index 17d09ccc..b47b9d83 100644
--- a/MPF.UI/Windows/OptionsWindow.xaml
+++ b/MPF.UI/Windows/OptionsWindow.xaml
@@ -404,15 +404,11 @@
 
                         <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Redumper">
                             <UniformGrid Columns="2" Rows="7">
-                                <CheckBox VerticalAlignment="Center" Content="Enable Debug Output"
-                                          IsChecked="{Binding Options.RedumperEnableDebug}"
-                                          ToolTip="Enable debug output in logs" Margin="0,4"
-                                />
-
                                 <CheckBox VerticalAlignment="Center" Content="Enable Verbose Output"
                                           IsChecked="{Binding Options.RedumperEnableVerbose}"
                                           ToolTip="Enable verbose output in logs" Margin="0,4"
                                 />
+                                <Label/> <!-- Empty label for padding -->
 
                                 <Label Content="Reread Tries:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
                                 <TextBox VerticalAlignment="Center" VerticalContentAlignment="Center" Width="200" HorizontalAlignment="Left"