GKv3: bugfixes and update for closed release

Serg-Norseman · Mar 27, 2023 · a349ce6 · a349ce6
1 parent 27a21e3
commit a349ce6
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 10 deletions.
diff --git a/deploy/DEBIAN/changelog b/deploy/DEBIAN/changelog
@@ -1,4 +1,4 @@
-gedkeeper (3.0.2-1~rc1) unstable; urgency=low
+gedkeeper (3.0.3-1~rc1) unstable; urgency=low
 
   * Packaged release
   * See changelog.md for changes

diff --git a/deploy/DEBIAN/control b/deploy/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: gedkeeper
-Version: 3.0.2-1
+Version: 3.0.3-1
 Architecture: all
 Depends: mono-complete (>=5.12), sqlite3, vlc, libvlc-dev
 Maintainer: Sergey V. Zhdanovskih (aka Norseman) <[email protected]>

diff --git a/deploy/gedkeeper.appdata.xml b/deploy/gedkeeper.appdata.xml
@@ -40,7 +40,7 @@
   <developer_name>Sergey V. Zhdanovskih</developer_name>
 
   <releases>
-    <release version="3.0.2" date="2023-03-28">
+    <release version="3.0.3" date="2023-03-28">
       <description>
       </description>
     </release>

diff --git a/locales/dev/gkhDev_Implementations.html b/locales/dev/gkhDev_Implementations.html
@@ -51,7 +51,7 @@ <h3>GEDKeeper3 (GKv3)</h3>
 	<p>Development period: <b>24.05.2017 - present time</b>.</p>
 	<p>Specificity: C#, <a href="https://github.com/picoe/eto">Eto.Forms</a>.</p>
 	<p>Status: <b>design and functional development</b>.</p>
-	<p>Last version: 3.0.2.</p>
+	<p>Last version: 3.0.3.</p>
 
 
 	<h3>GEDKeeperJ</h3>

diff --git a/make_gk3_linux_debian_pack.sh b/make_gk3_linux_debian_pack.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-APP_VER="3.0.2"
+APP_VER="3.0.3"
 
 dotnet build projects/GKv3/GEDKeeper3.sln -c Linux_Release
 #xbuild ./projects/GKv2/GEDKeeper2.sln /p:Configuration=Release /p:Platform="x64" /p:MonoCS=true /p:TargetFrameworkVersion=v4.7.2 /v:quiet

diff --git a/projects/GKCore/GKCore/BaseContext.cs b/projects/GKCore/GKCore/BaseContext.cs
@@ -1279,7 +1279,11 @@ public IImage LoadMediaImage(GDMFileReference fileReference, int thumbWidth, int
                 if (stm != null) {
                     try {
                         if (stm.Length != 0) {
-                            result = AppHost.GfxProvider.CreateImage(stm, thumbWidth, thumbHeight, cutoutArea);
+                            if (thumbWidth <= 0 || thumbHeight <= 0) {
+                                Logger.WriteInfo("BaseContext.LoadMediaImage(): thumbWidth and thumbHeight must not be zero");
+                            } else {
+                                result = AppHost.GfxProvider.CreateImage(stm, thumbWidth, thumbHeight, cutoutArea);
+                            }
                         }
                     } finally {
                         stm.Dispose();

diff --git a/projects/GKCore/GKCore/GKData.cs b/projects/GKCore/GKCore/GKData.cs
@@ -35,7 +35,7 @@ public static class GKData
         public const string APP_COPYRIGHT = "Copyright © 2009-2023 by Sergey V. Zhdanovskih";
 
         public const string APP_VERSION_2X = "2.25.0.0";
-        public const string APP_VERSION_3X = "3.0.2.0";
+        public const string APP_VERSION_3X = "3.0.3.0";
 
         public const string APP_MAIL = "[email protected]";
 

diff --git a/projects/GKCore/GKCore/PortraitsCache.cs b/projects/GKCore/GKCore/PortraitsCache.cs
@@ -53,8 +53,7 @@ private PortraitsCache()
         protected override void Dispose(bool disposing)
         {
             if (disposing) {
-                foreach (KeyValuePair<string, IImage> pair in fMemoryCache)
-                {
+                foreach (KeyValuePair<string, IImage> pair in fMemoryCache) {
                     pair.Value.Dispose();
                 }
             }
@@ -97,7 +96,11 @@ public IImage GetImage(IBaseContext context, GDMIndividualRecord iRec)
 
                 // save image to cache
                 if (result != null) {
-                    AppHost.GfxProvider.SaveImage(result, cachedFile);
+                    try {
+                        AppHost.GfxProvider.SaveImage(result, cachedFile);
+                    } catch (Exception ex) {
+                        Logger.WriteError(string.Format("PortraitsCache.GetImage()->SaveImage({0})", cachedFile), ex);
+                    }
                 }
             }