fix deadlock during page adjustments change

fix resize settings getting overwritten
t0815 · Aug 18, 2024 · 5d86354 · 5d86354
1 parent 0f97936
commit 5d86354
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 25 deletions.
diff --git a/MyCBZ/App.config b/MyCBZ/App.config
@@ -135,7 +135,7 @@
     <applicationSettings>
         <Win_CBZ.Win_CBZSettings>
             <setting name="Version" serializeAs="String">
-                <value>0.19.137b</value>
+                <value>0.19.138b</value>
             </setting>
             <setting name="RenamerPlaceholders" serializeAs="Xml">
                 <value>

diff --git a/MyCBZ/Events/PageChangedEvent.cs b/MyCBZ/Events/PageChangedEvent.cs
@@ -29,12 +29,22 @@ internal class PageChangedEvent
 
         public object OldValue { get; set; }
 
+        public bool NoThumbRefresh { get; set; }
+
 
         public PageChangedEvent(Page page, object old, int state = PageChangedEvent.IMAGE_STATUS_NEW)
         {
             State = state; 
             Page = page;
             OldValue = old;
-        }   
+        }
+
+        public PageChangedEvent(Page page, object old, int state = PageChangedEvent.IMAGE_STATUS_NEW, bool noThumbRefresh = false)
+        {
+            State = state;
+            Page = page;
+            OldValue = old;
+            NoThumbRefresh = noThumbRefresh;
+        }
     }
 }
diff --git a/MyCBZ/Forms/MainForm.cs b/MyCBZ/Forms/MainForm.cs
@@ -621,7 +621,7 @@ private void PageChanged(object sender, PageChangedEvent e)
                     }
                 }));
 
-                if (TogglePagePreviewToolbutton.Checked)
+                if (TogglePagePreviewToolbutton.Checked && !e.NoThumbRefresh)
                 {
                     if (e.Page != null)
                     {
@@ -632,7 +632,11 @@ private void PageChanged(object sender, PageChangedEvent e)
                                 PageThumbsListBox.Invoke(new Action(() =>
                                 {
                                     CreatePagePreviewFromItem(e.Page, e.OldValue as Page);
+
+                                    return;
                                 }));
+
+                                
                             });
                         }
                     }
@@ -4699,7 +4703,7 @@ private void UpdateImageAdjustments(string selected)
 
                     if (page != null)
                     {
-                        PageChanged(this, new PageChangedEvent(page, null, PageChangedEvent.IMAGE_STATUS_CHANGED));
+                        PageChanged(this, new PageChangedEvent(page, null, PageChangedEvent.IMAGE_STATUS_CHANGED, true));
                     }
                 }
             }
@@ -5323,37 +5327,25 @@ private void TextBoxResizePageIndexReference_TextChanged(object sender, EventArg
         private void TextBoxResizeW_TextChanged(object sender, EventArgs e)
         {
             int w = 0;
-            int h = 0;
 
             if (TextBoxResizeW.Text.Length > 0)
             {
                 w = int.Parse(TextBoxResizeW.Text);
             }
 
-            if (TextBoxResizeH.Text.Length > 0)
-            {
-                h = int.Parse(TextBoxResizeH.Text);
-            }
-
-            selectedImageTask.ImageAdjustments.ResizeTo = new Point(w, h);
+            selectedImageTask.ImageAdjustments.ResizeTo = new Point(w, selectedImageTask.ImageAdjustments.ResizeTo.Y);
         }
 
         private void TextBoxResizeH_TextChanged(object sender, EventArgs e)
         {
-            int w = 0;
             int h = 0;
 
-            if (TextBoxResizeW.Text.Length > 0)
-            {
-                w = int.Parse(TextBoxResizeW.Text);
-            }
-
             if (TextBoxResizeH.Text.Length > 0)
             {
                 h = int.Parse(TextBoxResizeH.Text);
             }
 
-            selectedImageTask.ImageAdjustments.ResizeTo = new Point(w, h);
+            selectedImageTask.ImageAdjustments.ResizeTo = new Point(selectedImageTask.ImageAdjustments.ResizeTo.X, h);
         }
 
         private void TextBoxSplitPageAt_TextAlignChanged(object sender, EventArgs e)

diff --git a/MyCBZ/Win_CBZ.csproj b/MyCBZ/Win_CBZ.csproj
@@ -21,7 +21,7 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.19.137.%2a</ApplicationVersion>
+    <ApplicationVersion>0.19.138.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

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="Version" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">0.19.137b</Value>
+      <Value Profile="(Default)">0.19.138b</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
@@ -48,7 +48,7 @@ Microsoft Visual Studio [Community] 2022 (64-Bit)
 
 ## Latest Release
 
-v0.19.137b released!
+v0.19.138b released!
 
 ## Third party components
 

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:{A4E84D34-58E0-48D8-9E75-78679337DA27}"
-        "PackageCode" = "8:{E88CD018-09B5-4148-9479-7BFE9182299A}"
+        "ProductCode" = "8:{B57638FB-269E-400E-9563-7A1B3A7C7A28}"
+        "PackageCode" = "8:{EF7FBA10-50D0-4F3D-9859-E2EB41C2C438}"
         "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.19.137"
+        "ProductVersion" = "8:0.19.138"
         "Manufacturer" = "8:Trash_s0Ft"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"