From 522c77ea3df6c62726d81e7374df1e3a6dd591de Mon Sep 17 00:00:00 2001
From: "Sergey V. Zhdanovskih" <serg.zhdanovskih@yandex.ru>
Date: Thu, 12 Sep 2024 21:29:07 +0300
Subject: [PATCH] Added protection against problems with folders in Windows if
 the file name has a space before the extension (fix #596)

---
 locales/help_enu/gkhHistory.html      |  1 +
 locales/help_rus/gkhHistory.html      |  1 +
 projects/GKCore/GKCore/BaseContext.cs | 17 +++++++++++++++++
 3 files changed, 19 insertions(+)

diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html
index a57a4fd6c..b17549bc8 100644
--- a/locales/help_enu/gkhHistory.html
+++ b/locales/help_enu/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>Change log</h1>
 
     <p>
         <b>??.??.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
+            <li>Added protection against problems with folders in Windows if the file name has a space before the extension.
             <li>Added statistics type on parents' ages at child's birth.
             <li>Fixed a frequent error saving images to cache "A generic error occurred in GDI+".
             <li>Added the feature to save trees to PDF files.
diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
index d50707f6b..ee2d9c7ca 100644
--- a/locales/help_rus/gkhHistory.html
+++ b/locales/help_rus/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>История версий</h1>
 
     <p>
         <b>??.??.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
+            <li>Добавлена защита от проблем с папками в Windows, если в имени файла перед расширением есть пробел.
             <li>Добавлен тип статистики по возрастам родителей при рождении ребенка.
             <li>Исправлена частая ошибка сохранения изображений в кэш "A generic error occurred in GDI+".
             <li>Добавлена возможность сохранения диаграмм деревьев в PDF-файлы.
diff --git a/projects/GKCore/GKCore/BaseContext.cs b/projects/GKCore/GKCore/BaseContext.cs
index ef3a0c090..2e7110f31 100644
--- a/projects/GKCore/GKCore/BaseContext.cs
+++ b/projects/GKCore/GKCore/BaseContext.cs
@@ -1539,10 +1539,27 @@ private void RemoveOldestBackups(string fileName, string bakPath)
             }
         }
 
+        private static string CheckFileName(string fileName)
+        {
+            // Control of possible folder management problems in Windows
+            // if there is a space before the dot in the file name
+            // (the folder cannot be deleted, copied, renamed, moved).
+            string purePath = Path.GetDirectoryName(fileName);
+            string pureFileName = Path.GetFileNameWithoutExtension(fileName);
+            string ext = Path.GetExtension(fileName);
+            if (pureFileName.EndsWith(" ")) {
+                pureFileName = pureFileName.TrimEnd();
+                fileName = Path.Combine(purePath, Path.ChangeExtension(pureFileName, ext));
+            }
+            return fileName;
+        }
+
         private void FileSave(string fileName, string password)
         {
             string oldFileName = fFileName;
 
+            fileName = CheckFileName(fileName);
+
             switch (GlobalOptions.Instance.FileBackup) {
                 case FileBackup.fbNone:
                     break;