From 56129253d9e83cfe6ea70ce319395f460f43a8ab Mon Sep 17 00:00:00 2001
From: BONNEVILLE Geoffroy <gbonneville@mega.com>
Date: Mon, 12 Mar 2018 12:45:12 +0100
Subject: [PATCH] Use ModernKeePass Lib 2.38.2 Changed suspension save errors
 handling

---
 ModernKeePass/App.xaml.cs             | 12 +++++++++---
 ModernKeePass/ModernKeePassApp.csproj |  2 +-
 ModernKeePass/packages.config         |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ModernKeePass/App.xaml.cs b/ModernKeePass/App.xaml.cs
index ff9141f..5432080 100644
--- a/ModernKeePass/App.xaml.cs
+++ b/ModernKeePass/App.xaml.cs
@@ -183,10 +183,16 @@ namespace ModernKeePass
         private async void OnSuspending(object sender, SuspendingEventArgs e)
         {
             var deferral = e.SuspendingOperation.GetDeferral();
-            UnhandledException -= OnUnhandledException;
             var database = DatabaseService.Instance;
-            if (SettingsService.Instance.GetSetting("SaveSuspend", true)) database.Save();
-            await database.Close(false);
+            try
+            {
+                if (SettingsService.Instance.GetSetting("SaveSuspend", true)) database.Save();
+                await database.Close(false);
+            }
+            catch (Exception exception)
+            {
+                ToastNotificationHelper.ShowErrorToast(exception);
+            }
             deferral.Complete();
         }
         
diff --git a/ModernKeePass/ModernKeePassApp.csproj b/ModernKeePass/ModernKeePassApp.csproj
index b4057fe..2241608 100644
--- a/ModernKeePass/ModernKeePassApp.csproj
+++ b/ModernKeePass/ModernKeePassApp.csproj
@@ -365,7 +365,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="ModernKeePassLib, Version=2.37.0.2000, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ModernKeePassLib.2.38.1\lib\netstandard1.2\ModernKeePassLib.dll</HintPath>
+      <HintPath>..\packages\ModernKeePassLib.2.38.2\lib\netstandard1.2\ModernKeePassLib.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Splat, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/ModernKeePass/packages.config b/ModernKeePass/packages.config
index 62995e7..3d6107f 100644
--- a/ModernKeePass/packages.config
+++ b/ModernKeePass/packages.config
@@ -7,7 +7,7 @@
   <package id="Microsoft.NETCore.Platforms" version="2.0.1" targetFramework="win81" />
   <package id="Microsoft.NETCore.Portable.Compatibility" version="1.0.2" targetFramework="win81" />
   <package id="Microsoft.Toolkit.Uwp.Notifications" version="2.0.0" targetFramework="win81" />
-  <package id="ModernKeePassLib" version="2.38.1" targetFramework="win81" />
+  <package id="ModernKeePassLib" version="2.38.2" targetFramework="win81" />
   <package id="NETStandard.Library" version="2.0.1" targetFramework="win81" />
   <package id="Portable.BouncyCastle" version="1.8.1.3" targetFramework="win81" />
   <package id="Splat" version="2.0.0" targetFramework="win81" />