Fix: Very first load of ROM file would fail.

...as it is null.
deanthecoder · Feb 3, 2024 · f5bac8b · f5bac8b
1 parent 7f027d5
commit f5bac8b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Speculator/Speculator/ViewModels/RomSelectorViewModel.cs b/Speculator/Speculator/ViewModels/RomSelectorViewModel.cs
@@ -46,7 +46,7 @@ public RomSelectorViewModel(ZxSpectrum speccy)
 
         LoadBasicRomAction = romFile =>
         {
-            speccy.LoadBasicRom(romFile);
+            speccy.LoadBasicRom(romFile ?? RomFile);
 
             Settings.Instance.RomFile = romFile;
             Settings.Instance.UseSpeccyColors = UseSpeccyColors;

diff --git a/Speculator/Speculator/Views/MainWindow.axaml.cs b/Speculator/Speculator/Views/MainWindow.axaml.cs
@@ -11,10 +11,12 @@
 
 using System;
 using System.Linq;
+using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
+using Avalonia.Threading;
 using CSharp.Utils.Extensions;
 using CSharp.Utils.UI;
 using Material.Icons.Avalonia;