Resolve Merge-conflicts with [#60]

t0815 · Nov 5, 2024 · fdc28b8 · fdc28b8
2 parents ee0ca4d + c971632
commit fdc28b8
Showing 1 changed file with 5 additions and 3 deletions.
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;
                         }