Tidy

Author: Tkael

EDDI/App.xaml.cs

@@ -15,6 +15,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using Utilities;
+using Version = System.Version;
 
 [assembly: InternalsVisibleTo( "Tests" )]
 namespace Eddi
@@ -34,6 +35,8 @@ public static void Main ( string[] args = null )
         {
             // Parse command-line arguments
             args ??= Environment.GetCommandLineArgs().Skip( 1 ).ToArray();
+            var fromVoiceAttack = args.Any(arg =>
+                arg.Equals("--voice-attack-plugin", StringComparison.OrdinalIgnoreCase));
             VoiceAttackVersion = ParseVoiceAttackVersion( args );
 
             Logging.IncrementLogs(); // Increment to a new log file.
@@ -63,7 +66,7 @@ public static void Main ( string[] args = null )
 
             try
             {
-                Initialize( app, VoiceAttackVersion, configuration );
+                Initialize( app, fromVoiceAttack, VoiceAttackVersion, configuration );
             }
             catch ( Exception e )
             {
@@ -103,7 +106,7 @@ private static System.Version ParseVoiceAttackVersion( string[] args )
             return null;
         }
 
-        private static void Initialize( App app, System.Version vaVersion = null, EDDIConfiguration configuration = null )
+        private static void Initialize ( App app, bool fromVA = false, Version vaVersion = null, EDDIConfiguration configuration = null )
         {
             // Prepare to start the application
             if ( configuration != null && !configuration.DisableTelemetry )
@@ -131,12 +134,13 @@ private static void Initialize( App app, System.Version vaVersion = null, EDDICo
                 }
             }
 
+            EDDI.Instance.FromVA = fromVA;
+
             // Wait for preload to complete before MainWindow creation
             var preloadTasks = PreloadCriticalServicesAsync();
             Task.WaitAll( preloadTasks.ToArray() );
 
-            EDDI.Instance.FromVA = vaVersion is not null;
-            if ( EDDI.Instance.FromVA )
+            if ( fromVA )
             {
                 // Create the MainWindow with visibility controlled by code-behind logic
                 // (hidden by default in VA mode, shown on demand via VA commands)
@@ -265,10 +269,10 @@ public static void ApplyAnyOverrideCulture(EDDIConfiguration configuration = nul
                 var overrideCulture = string.IsNullOrEmpty(configuration.OverrideCulture) ? null : new CultureInfo(configuration.OverrideCulture);
                 ApplyCulture(overrideCulture);
             }
-            catch
+            catch ( Exception ex )
             {
-                ApplyCulture(null);
-                Debug.WriteLine("Culture [{0}] not available", configuration.OverrideCulture);
+                Logging.Warn( $"Culture [{configuration.OverrideCulture}] could not be applied; falling back to system culture.", ex );
+                ApplyCulture( null);
             }
         }