From b2fcc190fd89824db15b01ac518e51d1f067ba9a Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Thu, 16 Oct 2025 21:09:42 -0400
Subject: [PATCH] Clean up nullability

---
 MPF.Frontend/EnumExtensions.cs | 8 ++++++++
 MPF.Frontend/Options.cs        | 7 +++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/MPF.Frontend/EnumExtensions.cs b/MPF.Frontend/EnumExtensions.cs
index e52b0028..eb0acf7f 100644
--- a/MPF.Frontend/EnumExtensions.cs
+++ b/MPF.Frontend/EnumExtensions.cs
@@ -213,6 +213,14 @@ namespace MPF.Frontend
 
         #region Convert to Short Name
 
+        /// <summary>
+        /// Get the short string representation of the InterfaceLanguage enum values
+        /// </summary>
+        /// <param name="lang">InterfaceLanguage value to convert</param>
+        /// <returns>String representing the value, if possible</returns>
+        public static string ShortName(this InterfaceLanguage lang)
+            => ((InterfaceLanguage?)lang).ShortName();
+
         /// <summary>
         /// Get the short string representation of the InterfaceLanguage enum values
         /// </summary>
diff --git a/MPF.Frontend/Options.cs b/MPF.Frontend/Options.cs
index c4ae0625..046d89f1 100644
--- a/MPF.Frontend/Options.cs
+++ b/MPF.Frontend/Options.cs
@@ -145,13 +145,12 @@ namespace MPF.Frontend
         /// <summary>
         /// Default UI language to launch MPF into
         /// </summary>
-        public InterfaceLanguage? DefaultUILanguage
+        public InterfaceLanguage DefaultUILanguage
         {
             get
             {
-                var valueString = GetStringSetting(Settings, "DefaultUILanguage", RedumpSystem.IBMPCcompatible.LongName());
-                var valueEnum = (valueString ?? string.Empty).ToInterfaceLanguage();
-                return valueEnum;
+                var valueString = GetStringSetting(Settings, "DefaultUILanguage", InterfaceLanguage.AutoDetect.ShortName());
+                return valueString.ToInterfaceLanguage();
             }
             set
             {