Me not testing things properly

tstavrianos · Apr 27, 2020 · 6a73916 · 6a73916
1 parent 25682fd
commit 6a73916
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/BannerLord.Common/ModManager.cs b/BannerLord.Common/ModManager.cs
@@ -112,6 +112,7 @@ public bool Run(string gameExe, string extraGameArguments, out string errorMessa
             errorMessage = default;
             if (!this._client.CanRun(gameExe, extraGameArguments)) return false;
 
+            gameExe ??= "Bannerlord.exe";
             var actualGameExe = Path.Combine(this.GameExeFolder, gameExe);
             if (string.IsNullOrEmpty(actualGameExe))
             {
@@ -148,6 +149,7 @@ public bool Run(string gameExe, string extraGameArguments, out string errorMessa
                     //
                 }
 
+            extraGameArguments ??= "";
             var args = extraGameArguments.Trim() + " " + this.GameArguments().Trim();
             this.Log().Warn($"Trying to execute: {actualGameExe} {args}");
             var info = new ProcessStartInfo

diff --git a/BannerLordLauncher/ViewModels/MainWindowViewModel.cs b/BannerLordLauncher/ViewModels/MainWindowViewModel.cs
@@ -227,7 +227,7 @@ public void Initialize()
 
         private void RunCmd()
         {
-            if (!this.Manager.Run(this._window.Configuration.GameExeId == 1 ? "Bannerlord_Native.exe" : "Bannerlord.exe", this._window.Configuration.ExtraGameArguments, out var error))
+            if (!this.Manager.Run(this._window.Configuration.GameExeId == 1 ? "Bannerlord.Native.exe" : "Bannerlord.exe", this._window.Configuration.ExtraGameArguments, out var error))
             {
                 if (!string.IsNullOrEmpty(error)) this.SafeMessage(error);
                 return;

diff --git a/BannerLordLauncher/Views/OptionsDialog.xaml b/BannerLordLauncher/Views/OptionsDialog.xaml
@@ -64,7 +64,7 @@
         <TextBlock Grid.Column="0" Grid.Row="6" Text="Game exe to use" Foreground="{DynamicResource PackIconMaterialForeground1}" FontSize="14"/>
         <ComboBox Grid.Column="1" Grid.Row="6" Style="{StaticResource SimpleComboBox}" SelectedIndex="{Binding Path=Config.GameExeId}" Margin="0,0,5,0" Foreground="{DynamicResource ModListItemNative}" Background="{DynamicResource StackPanelBackground1}" BorderBrush="{DynamicResource PackIconMaterialBorderBrush1}">
             <ComboBoxItem Style="{StaticResource SimpleComboBoxItem}">BannerLord.exe</ComboBoxItem>
-            <ComboBoxItem Style="{StaticResource SimpleComboBoxItem}" Background="{DynamicResource StackPanelBackground1}" BorderBrush="{DynamicResource PackIconMaterialBorderBrush1}">BannerLord_Native.exe</ComboBoxItem>
+            <ComboBoxItem Style="{StaticResource SimpleComboBoxItem}">BannerLord.Native.exe</ComboBoxItem>
         </ComboBox>
 
         <TextBlock Grid.Column="0" Grid.Row="8" Text="Check for updates at startup" Foreground="{DynamicResource PackIconMaterialForeground1}" FontSize="14"/>