From 7613629d872ca026b605a07180d96ed60b3f4fdf Mon Sep 17 00:00:00 2001
From: BONNEVILLE Geoffroy <gbonneville@mega.com>
Date: Mon, 12 Mar 2018 12:40:07 +0100
Subject: [PATCH] Deactivation of buggy Splat custom icon implementation

---
 ModernKeePassLib/ModernKeePassLib.nuspec |  4 ++--
 ModernKeePassLib/PwCustomIcon.cs         | 11 ++++-------
 ModernKeePassLib/Utility/GfxUtil.PCL.cs  | 15 ++++++++-------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/ModernKeePassLib/ModernKeePassLib.nuspec b/ModernKeePassLib/ModernKeePassLib.nuspec
index 9c86827..37fc782 100644
--- a/ModernKeePassLib/ModernKeePassLib.nuspec
+++ b/ModernKeePassLib/ModernKeePassLib.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>ModernKeePassLib</id>
-    <version>2.38.1</version>
+    <version>2.38.2</version>
     <title>ModernKeePassLib</title>
     <authors>Geoffroy Bonneville</authors>
     <owners>Geoffroy Bonneville</owners>
@@ -10,7 +10,7 @@
     <projectUrl>https://github.com/wismna/ModernKeePass</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Portable KeePass Password Management Library that targets .Net Standard and WinRT. Allows reading, editing and writing to KeePass 2.x databases.</description>
-    <releaseNotes>Version bump to 2.38</releaseNotes>
+    <releaseNotes>Deactivation of buggy custom icon implementation</releaseNotes>
     <copyright>Copyright © 2018 Geoffroy Bonneville</copyright>
     <tags>KeePass KeePassLib Portable PCL NetStandard</tags>
     <dependencies>
diff --git a/ModernKeePassLib/PwCustomIcon.cs b/ModernKeePassLib/PwCustomIcon.cs
index 9be0a06..103d3d4 100644
--- a/ModernKeePassLib/PwCustomIcon.cs
+++ b/ModernKeePassLib/PwCustomIcon.cs
@@ -80,11 +80,7 @@ namespace ModernKeePassLib
 			// MemoryStream ms = new MemoryStream(m_pbImageDataPng, false);
 			// m_imgOrg = Image.FromStream(ms);
 			// ms.Close();
-#if ModernKeePassLib
-            try { m_imgOrg = GfxUtil.LoadImage(m_pbImageDataPng).GetAwaiter().GetResult(); }
-#else
 			try { m_imgOrg = GfxUtil.LoadImage(m_pbImageDataPng); }
-#endif
 			catch(Exception) { Debug.Assert(false); m_imgOrg = null; }
 
 			if(m_imgOrg != null)
@@ -121,13 +117,14 @@ namespace ModernKeePassLib
 
 			Image img;
 			if(m_dImageCache.TryGetValue(lID, out img)) return img;
+
 #if ModernKeePassLib
-            img = GfxUtil.ScaleImage(m_pbImageDataPng, w, h).GetAwaiter().GetResult();
+            img = GfxUtil.ScaleImage(m_pbImageDataPng, w, h);
 #else
 			img = GfxUtil.ScaleImage(m_imgOrg, w, h, ScaleTransformFlags.UIIcon);
 #endif
-		    m_dImageCache[lID] = img;
-		    return img;
+			m_dImageCache[lID] = img;
+			return img;
 		}
 #endif
 	}
diff --git a/ModernKeePassLib/Utility/GfxUtil.PCL.cs b/ModernKeePassLib/Utility/GfxUtil.PCL.cs
index 16a8069..72f10fc 100644
--- a/ModernKeePassLib/Utility/GfxUtil.PCL.cs
+++ b/ModernKeePassLib/Utility/GfxUtil.PCL.cs
@@ -1,22 +1,23 @@
 using System.IO;
-using System.Threading.Tasks;
 using Splat;
 
 namespace ModernKeePassLib.Utility
 {
     public class GfxUtil
     {
-        public static async Task<IBitmap> LoadImage(byte[] pb)
+        public static IBitmap LoadImage(byte[] pb)
         {
-            return await ScaleImage(pb, null, null);
+            return null;
+            //return ScaleImage(pb, null, null);
         }
 
-        public static async Task<IBitmap> ScaleImage(byte[] pb, int? w, int? h)
+        public static IBitmap ScaleImage(byte[] pb, int? w, int? h)
         {
-            using (var ms = new MemoryStream(pb, false))
+            return null;
+            /*using (var ms = new MemoryStream(pb, false))
             {
-                return await BitmapLoader.Current.Load(ms, w, h);
-            }
+                return BitmapLoader.Current.Load(ms, w, h).Result;
+            }*/
         }
     }
 }