Skip to content

Commit 5d86354

Browse files
committed
fix deadlock during page adjustments change
fix resize settings getting overwritten
1 parent 0f97936 commit 5d86354

File tree

8 files changed

+27
-25
lines changed

8 files changed

+27
-25
lines changed

MyCBZ/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
<applicationSettings>
136136
<Win_CBZ.Win_CBZSettings>
137137
<setting name="Version" serializeAs="String">
138-
<value>0.19.137b</value>
138+
<value>0.19.138b</value>
139139
</setting>
140140
<setting name="RenamerPlaceholders" serializeAs="Xml">
141141
<value>

MyCBZ/Events/PageChangedEvent.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,22 @@ internal class PageChangedEvent
2929

3030
public object OldValue { get; set; }
3131

32+
public bool NoThumbRefresh { get; set; }
33+
3234

3335
public PageChangedEvent(Page page, object old, int state = PageChangedEvent.IMAGE_STATUS_NEW)
3436
{
3537
State = state;
3638
Page = page;
3739
OldValue = old;
38-
}
40+
}
41+
42+
public PageChangedEvent(Page page, object old, int state = PageChangedEvent.IMAGE_STATUS_NEW, bool noThumbRefresh = false)
43+
{
44+
State = state;
45+
Page = page;
46+
OldValue = old;
47+
NoThumbRefresh = noThumbRefresh;
48+
}
3949
}
4050
}

MyCBZ/Forms/MainForm.cs

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ private void PageChanged(object sender, PageChangedEvent e)
621621
}
622622
}));
623623

624-
if (TogglePagePreviewToolbutton.Checked)
624+
if (TogglePagePreviewToolbutton.Checked && !e.NoThumbRefresh)
625625
{
626626
if (e.Page != null)
627627
{
@@ -632,7 +632,11 @@ private void PageChanged(object sender, PageChangedEvent e)
632632
PageThumbsListBox.Invoke(new Action(() =>
633633
{
634634
CreatePagePreviewFromItem(e.Page, e.OldValue as Page);
635+
636+
return;
635637
}));
638+
639+
636640
});
637641
}
638642
}
@@ -4699,7 +4703,7 @@ private void UpdateImageAdjustments(string selected)
46994703

47004704
if (page != null)
47014705
{
4702-
PageChanged(this, new PageChangedEvent(page, null, PageChangedEvent.IMAGE_STATUS_CHANGED));
4706+
PageChanged(this, new PageChangedEvent(page, null, PageChangedEvent.IMAGE_STATUS_CHANGED, true));
47034707
}
47044708
}
47054709
}
@@ -5323,37 +5327,25 @@ private void TextBoxResizePageIndexReference_TextChanged(object sender, EventArg
53235327
private void TextBoxResizeW_TextChanged(object sender, EventArgs e)
53245328
{
53255329
int w = 0;
5326-
int h = 0;
53275330

53285331
if (TextBoxResizeW.Text.Length > 0)
53295332
{
53305333
w = int.Parse(TextBoxResizeW.Text);
53315334
}
53325335

5333-
if (TextBoxResizeH.Text.Length > 0)
5334-
{
5335-
h = int.Parse(TextBoxResizeH.Text);
5336-
}
5337-
5338-
selectedImageTask.ImageAdjustments.ResizeTo = new Point(w, h);
5336+
selectedImageTask.ImageAdjustments.ResizeTo = new Point(w, selectedImageTask.ImageAdjustments.ResizeTo.Y);
53395337
}
53405338

53415339
private void TextBoxResizeH_TextChanged(object sender, EventArgs e)
53425340
{
5343-
int w = 0;
53445341
int h = 0;
53455342

5346-
if (TextBoxResizeW.Text.Length > 0)
5347-
{
5348-
w = int.Parse(TextBoxResizeW.Text);
5349-
}
5350-
53515343
if (TextBoxResizeH.Text.Length > 0)
53525344
{
53535345
h = int.Parse(TextBoxResizeH.Text);
53545346
}
53555347

5356-
selectedImageTask.ImageAdjustments.ResizeTo = new Point(w, h);
5348+
selectedImageTask.ImageAdjustments.ResizeTo = new Point(selectedImageTask.ImageAdjustments.ResizeTo.X, h);
53575349
}
53585350

53595351
private void TextBoxSplitPageAt_TextAlignChanged(object sender, EventArgs e)

MyCBZ/Win_CBZ.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<UpdateRequired>false</UpdateRequired>
2222
<MapFileExtensions>true</MapFileExtensions>
2323
<ApplicationRevision>0</ApplicationRevision>
24-
<ApplicationVersion>0.19.137.%2a</ApplicationVersion>
24+
<ApplicationVersion>0.19.138.%2a</ApplicationVersion>
2525
<UseApplicationTrust>false</UseApplicationTrust>
2626
<BootstrapperEnabled>true</BootstrapperEnabled>
2727
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

MyCBZ/Win_CBZSettings.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

MyCBZ/Win_CBZSettings.settings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Value Profile="(Default)">%APPDATA%\WIN_CBZ\Temp\</Value>
77
</Setting>
88
<Setting Name="Version" Type="System.String" Scope="Application">
9-
<Value Profile="(Default)">0.19.137b</Value>
9+
<Value Profile="(Default)">0.19.138b</Value>
1010
</Setting>
1111
<Setting Name="RenamerPlaceholders" Type="System.Collections.Specialized.StringCollection" Scope="Application">
1212
<Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;

Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Microsoft Visual Studio [Community] 2022 (64-Bit)
4848

4949
## Latest Release
5050

51-
v0.19.137b released!
51+
v0.19.138b released!
5252

5353
## Third party components
5454

Win_CBZ-Setup/Win_CBZ-Setup.vdproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,15 +248,15 @@
248248
{
249249
"Name" = "8:Microsoft Visual Studio"
250250
"ProductName" = "8:Win_CBZ"
251-
"ProductCode" = "8:{A4E84D34-58E0-48D8-9E75-78679337DA27}"
252-
"PackageCode" = "8:{E88CD018-09B5-4148-9479-7BFE9182299A}"
251+
"ProductCode" = "8:{B57638FB-269E-400E-9563-7A1B3A7C7A28}"
252+
"PackageCode" = "8:{EF7FBA10-50D0-4F3D-9859-E2EB41C2C438}"
253253
"UpgradeCode" = "8:{66FAEF81-1CAE-4971-9E0F-796310EFEA5E}"
254254
"AspNetVersion" = "8:4.0.30319.0"
255255
"RestartWWWService" = "11:FALSE"
256256
"RemovePreviousVersions" = "11:TRUE"
257257
"DetectNewerInstalledVersion" = "11:TRUE"
258258
"InstallAllUsers" = "11:FALSE"
259-
"ProductVersion" = "8:0.19.137"
259+
"ProductVersion" = "8:0.19.138"
260260
"Manufacturer" = "8:Trash_s0Ft"
261261
"ARPHELPTELEPHONE" = "8:"
262262
"ARPHELPLINK" = "8:"

0 commit comments

Comments
 (0)