fix error saving archive, if page order has changed

t0815 · Nov 3, 2024 · c971632 · c971632
1 parent 89192cc
commit c971632
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 12 deletions.
diff --git a/MyCBZ/App.config b/MyCBZ/App.config
@@ -183,7 +183,7 @@
     <applicationSettings>
         <Win_CBZ.Win_CBZSettings>
             <setting name="InstalledVersion" serializeAs="String">
-                <value>0.22.182b</value>
+                <value>0.22.183b</value>
             </setting>
             <setting name="RenamerPlaceholders" serializeAs="Xml">
                 <value>

diff --git a/MyCBZ/Models/ProjectModel.cs b/MyCBZ/Models/ProjectModel.cs
@@ -1160,6 +1160,8 @@ public bool SaveAs(String path, ZipArchiveMode mode, MetaData.PageIndexVersion m
                 bool updateIndexMetadata = false;
                 int checkIndex = 0;
 
+                AppEventHandler.OnArchiveStatusChanged(this, new ArchiveStatusEvent(this, ArchiveStatusEvent.ARCHIVE_SAVING));
+
                 if (GlobalImageTask != null && 
                     (GlobalImageTask.ImageAdjustments.ConvertType > 0 ||
                      GlobalImageTask.ImageAdjustments.SplitPage ||
@@ -1184,9 +1186,9 @@ public bool SaveAs(String path, ZipArchiveMode mode, MetaData.PageIndexVersion m
                             applyImageProcessing = true;
                         }
 
-                        if (MetaData.FindIndexEntryForPage(page).GetAttribute(MetaDataEntryPage.COMIC_PAGE_ATTRIBUTE_IMAGE_WIDTH) != page.Format.W.ToString() ||
-                            MetaData.FindIndexEntryForPage(page).GetAttribute(MetaDataEntryPage.COMIC_PAGE_ATTRIBUTE_IMAGE_HEIGHT) != page.Format.H.ToString() ||
-                            MetaData.FindIndexEntryForPage(page).GetAttribute(MetaDataEntryPage.COMIC_PAGE_ATTRIBUTE_IMAGE_SIZE) != page.Size.ToString())
+                        if (MetaData.FindIndexEntryForPage(page)?.GetAttribute(MetaDataEntryPage.COMIC_PAGE_ATTRIBUTE_IMAGE_WIDTH) != page.Format.W.ToString() ||
+                            MetaData.FindIndexEntryForPage(page)?.GetAttribute(MetaDataEntryPage.COMIC_PAGE_ATTRIBUTE_IMAGE_HEIGHT) != page.Format.H.ToString() ||
+                            MetaData.FindIndexEntryForPage(page)?.GetAttribute(MetaDataEntryPage.COMIC_PAGE_ATTRIBUTE_IMAGE_SIZE) != page.Size.ToString())
                         {
                             updateIndexMetadata = true;
                         }

diff --git a/MyCBZ/Properties/AssemblyInfo.cs b/MyCBZ/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.22.182")]
-[assembly: AssemblyFileVersion("0.22.182")]
+[assembly: AssemblyVersion("0.22.183")]
+[assembly: AssemblyFileVersion("0.22.183")]
 [assembly: NeutralResourcesLanguage("en")]
diff --git a/MyCBZ/Win_CBZSettings.Designer.cs b/MyCBZ/Win_CBZSettings.Designer.cs
diff --git a/MyCBZ/Win_CBZSettings.settings b/MyCBZ/Win_CBZSettings.settings
@@ -6,7 +6,7 @@
       <Value Profile="(Default)">%APPDATA%\WIN_CBZ\Temp\</Value>
     </Setting>
     <Setting Name="InstalledVersion" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">0.22.182b</Value>
+      <Value Profile="(Default)">0.22.183b</Value>
     </Setting>
     <Setting Name="RenamerPlaceholders" Type="System.Collections.Specialized.StringCollection" Scope="Application">
       <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;

diff --git a/Readme.md b/Readme.md
@@ -53,7 +53,7 @@ Microsoft Visual Studio [Community] 2022 (64-Bit)
 
 ## Latest Release
 
-v0.22.182b released!
+v0.22.183b released!
 
 
 >[!IMPORTANT]

diff --git a/Win_CBZ-Setup/Win_CBZ-Setup.vdproj b/Win_CBZ-Setup/Win_CBZ-Setup.vdproj
@@ -248,15 +248,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Win_CBZ"
-        "ProductCode" = "8:{817C4590-F3B0-4C5E-8FE5-21C5DB86B39D}"
-        "PackageCode" = "8:{D0FEB7A2-3DFE-4E28-B5F3-FC00E623D301}"
+        "ProductCode" = "8:{95B19F0F-87F9-4126-BE56-44A3F111B11A}"
+        "PackageCode" = "8:{24B02EBD-C3E1-48DF-963A-8F275BF4E70C}"
         "UpgradeCode" = "8:{66FAEF81-1CAE-4971-9E0F-796310EFEA5E}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:0.22.182"
+        "ProductVersion" = "8:0.22.183"
         "Manufacturer" = "8:Trash_s0Ft"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"