Bugfixes

stevehjohn · Aug 15, 2024 · 9281374 · 9281374
1 parent 93577c8
commit 9281374
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 20 deletions.
diff --git a/src/Zen.Desktop.Host/Infrastructure/CharacterMap.cs b/src/Zen.Desktop.Host/Infrastructure/CharacterMap.cs
@@ -17,7 +17,12 @@ private CharacterMap()
 
     public int GetCharacterStartPixel(char character)
     {
-        return _characterMap[character];
+        if (_characterMap.TryGetValue(character, out var pixel))
+        {
+            return pixel;
+        }
+
+        return _characterMap['?'];
     }
 
     private void InitialiseCharacterMap()

diff --git a/src/Zen.Desktop.Host/Infrastructure/Settings/AppSettings.cs b/src/Zen.Desktop.Host/Infrastructure/Settings/AppSettings.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Runtime.InteropServices;
 using System.Text.Json;
 using Zen.Common.Infrastructure;
 using Zen.System.Infrastructure;
@@ -34,23 +35,32 @@ public class AppSettings
 
     private static AppSettings GetAppSettings()
     {
-        AppSettings settings;
+        var settings = new AppSettings
+        {
+            AudioEngine = RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
+                ? AudioEngine.Bass
+                : AudioEngine.PortAudio,
+            ScaleFactor = 2,
+            Sound = true,
+            SystemModel = Model.SpectrumPlus2
+        };
 
         try
         {
-            var json = File.ReadAllText(SettingsFile);
-
-            settings = JsonSerializer.Deserialize<AppSettings>(json);
+            if (File.Exists(SettingsFile))
+            {
+                var json = File.ReadAllText(SettingsFile);
 
-            settings.Speed = Speed.Normal;
+                settings = JsonSerializer.Deserialize<AppSettings>(json);
+            }
         }
         catch (Exception exception)
         {
             Logger.LogException(nameof(AppSettings), exception);
-
-            settings = new AppSettings();
         }
 
+        settings.Speed = Speed.Normal;
+
         return settings;
     }
 

diff --git a/src/Zen.Desktop.Host/Zen.Desktop.Host.csproj b/src/Zen.Desktop.Host/Zen.Desktop.Host.csproj
@@ -30,9 +30,6 @@
     <ProjectReference Include="..\Zen.Utilities\Zen.Utilities.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <None Update="app-settings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Update="Rom Images\ZX Spectrum +2\image-0.rom">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

diff --git a/src/Zen.Desktop.Host/app-settings.json b/src/Zen.Desktop.Host/app-settings.json