fix exception updating result, redraw updated page-thumb [#12]

t0815 · Sep 21, 2024 · ea49653 · ea49653
1 parent f9d6445
commit ea49653
Show file tree

Hide file tree

Showing 10 changed files with 144 additions and 120 deletions.
diff --git a/MyCBZ/App.config b/MyCBZ/App.config
@@ -168,7 +168,7 @@
     <applicationSettings>
         <Win_CBZ.Win_CBZSettings>
             <setting name="InstalledVersion" serializeAs="String">
-                <value>0.21.167b</value>
+                <value>0.21.168b</value>
             </setting>
             <setting name="RenamerPlaceholders" serializeAs="Xml">
                 <value>

diff --git a/MyCBZ/Forms/MainForm.Designer.cs b/MyCBZ/Forms/MainForm.Designer.cs
diff --git a/MyCBZ/Forms/MainForm.cs b/MyCBZ/Forms/MainForm.cs
@@ -1136,8 +1136,18 @@ private void OnRedrawThumbnail(object sender, RedrawThumbEvent e)
             {
                 Invoke(new Action(() =>
                 {
-                    ThumbnailPagesSlice.Add(e.Page);
-                    RequestImageInfoSlice();
+                    e.Page.ThumbnailInvalidated = true;
+                    int pageIndex = PageThumbsListBox.Items.IndexOf(e.Page);
+                    if (pageIndex > -1)
+                    {
+                        if (PageImages.Images.ContainsKey(e.Page.Id))
+                        {
+                            PageImages.Images.RemoveByKey(e.Page.Id);
+                        }
+                        PageThumbsListBox.Items[pageIndex] = e.Page;
+                    }
+                    PageThumbsListBox.Invalidate();
+                    PageThumbsListBox.Refresh();
                 }));
             }
         }
@@ -1261,7 +1271,7 @@ public void LoadThumbnailSlice(object threadParams)
                         {
                             try
                             {
-                                if (!page.Closed)
+                                if (!page.Closed && !page.Deleted)
                                 {
                                     if (!PageImages.Images.ContainsKey(page.Id))
                                     {
@@ -5940,7 +5950,7 @@ private void HandleImageAdjustmentsChanged(object sender, ImageAdjustmentsChange
                 if (e.PageId != null && e.PageId != "")
                 {
                     Page page = Program.ProjectModel.GetPageById(e.PageId);
-                    if (page != null && page.Id == ((Page)PagesList.SelectedItem.Tag).Id) 
+                    if (page != null && PagesList.SelectedItem != null && page.Id == ((Page)PagesList.SelectedItem.Tag).Id) 
                     {
                         updateCtls = RadioApplyAdjustmentsPage.Checked;
                     }