From bd3ca9051485028fa3463e7751abc8140ca8865d Mon Sep 17 00:00:00 2001
From: FelixSe <f.seidl@me.com>
Date: Tue, 29 May 2018 19:08:52 +0200
Subject: [PATCH] Fix crash in SettingsService, increase version

---
 FluentTerminal.App/FluentTerminal.App.csproj              | 3 +++
 FluentTerminal.App/Package.appxmanifest                   | 8 ++++----
 .../Services/Implementation/SettingsService.cs            | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/FluentTerminal.App/FluentTerminal.App.csproj b/FluentTerminal.App/FluentTerminal.App.csproj
index 85b17f0..6540ac3 100644
--- a/FluentTerminal.App/FluentTerminal.App.csproj
+++ b/FluentTerminal.App/FluentTerminal.App.csproj
@@ -22,6 +22,9 @@
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxBundle>Always</AppxBundle>
     <AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+    <AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
+    <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/FluentTerminal.App/Package.appxmanifest b/FluentTerminal.App/Package.appxmanifest
index 8e6817b..71fb9e0 100644
--- a/FluentTerminal.App/Package.appxmanifest
+++ b/FluentTerminal.App/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" IgnorableNamespaces="uap mp desktop rescap">
-  <Identity Name="53621FSApps.FluentTerminal" Publisher="CN=BDC72197-B634-438A-B863-16DCB7D90C85" Version="0.1.7.0" />
+  <Identity Name="53621FSApps.FluentTerminal" Publisher="CN=BDC72197-B634-438A-B863-16DCB7D90C85" Version="0.1.9.0" />
   <mp:PhoneIdentity PhoneProductId="f7225014-f405-4342-ad2e-ebf6ac60ea2c" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>Fluent Terminal</DisplayName>
@@ -26,15 +26,15 @@
         <uap:SplashScreen Image="Assets\AppIcons\SplashScreen.png" uap5:Optional="true" />
       </uap:VisualElements>
       <Extensions>
-        <uap:Extension Category="windows.appService">
-          <uap:AppService Name="FluentTerminalAppService" />
-        </uap:Extension>
         <desktop:Extension Category="windows.fullTrustProcess" Executable="Win32\FluentTerminal.SystemTray.exe" />
         <uap5:Extension Category="windows.appExecutionAlias" Executable="FluentTerminal.App.exe" EntryPoint="FluentTerminal.App.App">
           <uap5:AppExecutionAlias>
             <uap5:ExecutionAlias Alias="flute.exe" />
           </uap5:AppExecutionAlias>
         </uap5:Extension>
+        <uap:Extension Category="windows.appService">
+          <uap:AppService Name="FluentTerminalAppService" />
+        </uap:Extension>
       </Extensions>
     </Application>
   </Applications>
diff --git a/FluentTerminal.App/Services/Implementation/SettingsService.cs b/FluentTerminal.App/Services/Implementation/SettingsService.cs
index 67dba17..2628f5b 100644
--- a/FluentTerminal.App/Services/Implementation/SettingsService.cs
+++ b/FluentTerminal.App/Services/Implementation/SettingsService.cs
@@ -118,7 +118,7 @@ namespace FluentTerminal.App.Services.Implementation
         public KeyBindings GetKeyBindings()
         {
             var defaults = _defaultValueProvider.GetDefaultKeyBindings();
-            var keyBindings = _roamingSettings.ReadValueFromJson<KeyBindings>(nameof(KeyBindings), null);
+            var keyBindings = _roamingSettings.ReadValueFromJson<KeyBindings>(nameof(KeyBindings), null) ?? defaults;
 
             if (keyBindings.ConfigurableNewTab == null)
             {
@@ -130,7 +130,7 @@ namespace FluentTerminal.App.Services.Implementation
                 keyBindings.Search = defaults.Search;
             }
 
-            return keyBindings ?? _defaultValueProvider.GetDefaultKeyBindings();
+            return keyBindings;
         }
 
         public void SaveKeyBindings(KeyBindings keyBindings)