From 401630da1e5eeca407348735d1ec6a5e3ec4fd9f Mon Sep 17 00:00:00 2001
From: BONNEVILLE Geoffroy <gbonneville@mega.com>
Date: Wed, 8 Nov 2017 16:46:03 +0100
Subject: [PATCH] Correct error when opening database with an empty password

---
 ModernKeePass/BundleArtifacts/neutral.txt  | 8 ++++----
 ModernKeePass/Package.appxmanifest         | 2 +-
 ModernKeePass/ViewModels/CompositeKeyVm.cs | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ModernKeePass/BundleArtifacts/neutral.txt b/ModernKeePass/BundleArtifacts/neutral.txt
index 161dcae..657664a 100644
--- a/ModernKeePass/BundleArtifacts/neutral.txt
+++ b/ModernKeePass/BundleArtifacts/neutral.txt
@@ -1,4 +1,4 @@
-MainPackage=C:\Users\bg45\source\repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.5.0.25_AnyCPU.appx
-SymbolPackage=C:\Users\bg45\source\repos\ModernKeePass\ModernKeePass\AppPackages\ModernKeePass_1.5.0.25_Test\ModernKeePass_1.5.0.25_AnyCPU.appxsym
-ResourcePack=C:\Users\bg45\source\repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.5.0.25_scale-140.appx
-ResourcePack=C:\Users\bg45\source\repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.5.0.25_scale-180.appx
+MainPackage=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePassApp_1.6.0.26_AnyCPU.appx
+SymbolPackage=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\AppPackages\ModernKeePassApp_1.6.0.26_Test\ModernKeePassApp_1.6.0.26_AnyCPU.appxsym
+ResourcePack=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePassApp_1.6.0.26_scale-140.appx
+ResourcePack=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePassApp_1.6.0.26_scale-180.appx
diff --git a/ModernKeePass/Package.appxmanifest b/ModernKeePass/Package.appxmanifest
index ae0a478..7846042 100644
--- a/ModernKeePass/Package.appxmanifest
+++ b/ModernKeePass/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
-  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.6.0.25" />
+  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.6.0.26" />
   <Properties>
     <DisplayName>ModernKeePass</DisplayName>
     <PublisherDisplayName>wismna</PublisherDisplayName>
diff --git a/ModernKeePass/ViewModels/CompositeKeyVm.cs b/ModernKeePass/ViewModels/CompositeKeyVm.cs
index e98c5c9..46944a0 100644
--- a/ModernKeePass/ViewModels/CompositeKeyVm.cs
+++ b/ModernKeePass/ViewModels/CompositeKeyVm.cs
@@ -20,7 +20,7 @@ namespace ModernKeePass.ViewModels
         private readonly App _app = Application.Current as App;
         private bool _hasPassword;
         private bool _hasKeyFile;
-        private string _password;
+        private string _password = string.Empty;
         private string _status;
         private StatusTypes _statusType;
         private StorageFile _keyFile;