Fixes from testing on Windows

Author: MattEqualsCoder

.idea/.idea.MSURandomizer/.idea/avalonia.xml

@@ -31,7 +31,7 @@
     <ItemGroup>
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
         <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.9" />
-        <PackageReference Include="MattEqualsCoder.AvaloniaControls" Version="0.9.3" />
+        <PackageReference Include="MattEqualsCoder.AvaloniaControls" Version="0.9.4" />
         <PackageReference Include="MattEqualsCoder.GitHubReleaseChecker" Version="1.1.2" />
         <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
         <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />

MSURandomizer/MSURandomizer.csproj

@@ -27,11 +27,17 @@ sealed class Program
     public static void Main(string[] args)
     {
         Log.Logger = new LoggerConfiguration()
-            .MinimumLevel.Verbose()
+#if DEBUG
+            .MinimumLevel.Debug()
+#else
+            .MinimumLevel.Information()         
+#endif
             .Enrich.FromLogContext()
             .WriteTo.File(Directories.LogPath, rollingInterval: RollingInterval.Day, retainedFileCountLimit: 30)
+#if DEBUG
             .WriteTo.Debug()
             .WriteTo.Console()
+#endif
             .CreateLogger();
 
         MainHost = Host.CreateDefaultBuilder(args)

MSURandomizer/Program.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using System.Xml.Linq;
 using AutoMapper;
 using AvaloniaControls.ControlServices;
 using Microsoft.Extensions.Logging;
@@ -26,6 +27,12 @@ public HardwareModeWindowViewModel InitializeModel()
         return _model;
     }
 
+    public void Save()
+    {
+        mapper.Map(_model, msuUserOptionsService.MsuUserOptions);
+        msuUserOptionsService.Save();
+    }
+
     private void SnesConnectorServiceOnDisconnected(object? sender, EventArgs e)
     {
         _model.ConnectionStatus = "Disconnected";

MSURandomizer/Services/HardwareModeWindowService.cs

@@ -21,11 +21,6 @@ public class HardwareMsuWindowService(ITaskService taskService,
 
     public HardwareMsuViewModel InitializeModel()
     {
-        if (string.IsNullOrEmpty(msuUserOptionsService.MsuUserOptions.OutputRomPath))
-        {
-            _model.Message = "No rom selected";
-            return _model;
-        }
         snesConnectorService.Connected += SnesConnectorServiceOnConnected;
         snesConnectorService.Disconnected += SnesConnectorServiceOnDisconnected;
         return _model;
@@ -35,7 +30,10 @@ public HardwareMsuViewModel InitializeModel()
 
     private void SnesConnectorServiceOnConnected(object? sender, EventArgs e)
     {
-        _ = UploadMsuRom();
+        taskService.RunTask(async () =>
+        {
+            await UploadMsuRom();
+        });
     }
 
     public async Task UploadMsuRom()

MSURandomizer/Services/HardwareMsuWindowService.cs

@@ -10,6 +10,14 @@ public class MsuMonitorWindowViewModel : ViewModelBase
 {
     [Reactive] public SnesConnectorType ConnectorType { get; set; }
 
+    public string Usb2SnesAddress { get; set; } = "";
+
+    public string SniAddress { get; set; } = "";
+
+    public string LuaAddress { get; set; } = "";
+    
+    public string ClientName { get; set; } = "MSURandomizer";
+    
     [Reactive] public string ConnectionStatus { get; set; } = "Disconnected";
 
     [Reactive]

MSURandomizer/ViewModels/MsuMonitorWindowViewModel.cs

@@ -12,6 +12,14 @@ public class SnesConnectorSelectionViewModel : ViewModelBase
 {
     [Reactive] public SnesConnectorType ConnectorType { get; set; }
 
+    public string Usb2SnesAddress { get; set; } = "";
+
+    public string SniAddress { get; set; } = "";
+
+    public string LuaAddress { get; set; } = "";
+    
+    public string ClientName { get; set; } = "MSURandomizer";
+    
     public Func<Enum, bool> FilterConnectorTypes => @enum =>
         (SnesConnectorType)@enum is SnesConnectorType.None or SnesConnectorType.Sni or SnesConnectorType.Usb2Snes;
 }

MSURandomizer/ViewModels/SnesConnectorSelectionViewModel.cs

@@ -11,6 +11,7 @@
         CanResize="False"
         WindowStartupLocation="CenterOwner"
         x:DataType="viewModels:HardwareModeWindowViewModel"
+        Icon="/Assets/MSURandomizerIcon.ico"
         Title="Hardware Mode">
     <LayoutTransformControl Name="MainLayout">
         <DockPanel>

MSURandomizer/Views/HardwareModeWindow.axaml

@@ -43,6 +43,7 @@ private void CancelButton_OnClick(object? sender, RoutedEventArgs e)
 
     private void StartHardwareModeButton_OnClick(object? sender, RoutedEventArgs e)
     {
+        _service?.Save();
         Close(_model.Msus);
     }
 

MSURandomizer/Views/HardwareModeWindow.axaml.cs

@@ -11,6 +11,7 @@
         CanResize="False"
         WindowStartupLocation="CenterOwner"
         x:DataType="viewModels:HardwareMsuViewModel"
+        Icon="/Assets/MSURandomizerIcon.ico"
         Title="Hardware MSU">
     <LayoutTransformControl Name="MainLayout">
         <DockPanel>