fix page-renaming exception after cancel edit

t0815 · t0815 · commit 4a7d27a82cd1 · 2024-08-19T10:04:25.000+02:00
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.138b</value>
+                <value>0.19.139b</value>
             </setting>
             <setting name="RenamerPlaceholders" serializeAs="Xml">
                 <value>
diff --git a/MyCBZ/Forms/ApplicationDialog.cs b/MyCBZ/Forms/ApplicationDialog.cs
@@ -173,6 +173,7 @@ private void ApplicationDialog_KeyUp(object sender, KeyEventArgs e)
         {
             if (sender == this)
             {
+                /*
                 if (e.KeyCode == Keys.Escape)
                 {
                     DialogResult = _cancelResult;
@@ -184,6 +185,7 @@ private void ApplicationDialog_KeyUp(object sender, KeyEventArgs e)
                     DialogResult = _okResult;
                     Close();
                 }
+                */
             }
         }
 
diff --git a/MyCBZ/Forms/MainForm.cs b/MyCBZ/Forms/MainForm.cs
@@ -2437,6 +2437,13 @@ private void AddFilesToolStripMenuItem_Click(object sender, EventArgs e)
 
         private void PagesList_AfterLabelEdit(object sender, LabelEditEventArgs e)
         {
+            if (e.Label == null) 
+            { 
+                e.CancelEdit = true;
+
+                return; 
+            }
+
             if (e.Item > -1)
             {
                 ListViewItem changedItem = PagesList.Items[e.Item];
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.138.%2a</ApplicationVersion>
+    <ApplicationVersion>0.19.139.%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.138b</Value>
+      <Value Profile="(Default)">0.19.139b</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.138b released!
+v0.19.139b 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:{B57638FB-269E-400E-9563-7A1B3A7C7A28}"
-        "PackageCode" = "8:{EF7FBA10-50D0-4F3D-9859-E2EB41C2C438}"
+        "ProductCode" = "8:{24CA07E6-D8BB-4DA4-8402-15D72901C80D}"
+        "PackageCode" = "8:{2A46E5A9-0834-41FE-AE2B-2E955CEE21C2}"
         "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.138"
+        "ProductVersion" = "8:0.19.139"
         "Manufacturer" = "8:Trash_s0Ft"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"

Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,7 @@ private void ApplicationDialog_KeyUp(object sender, KeyEventArgs e)`
`173`	`173`	`{`
`174`	`174`	`if (sender == this)`
`175`	`175`	`{`
	`176`	`+ /*`
`176`	`177`	`if (e.KeyCode == Keys.Escape)`
`177`	`178`	`{`
`178`	`179`	`DialogResult = _cancelResult;`
`@@ -184,6 +185,7 @@ private void ApplicationDialog_KeyUp(object sender, KeyEventArgs e)`
`184`	`185`	`DialogResult = _okResult;`
`185`	`186`	`Close();`
`186`	`187`	`}`
	`188`	`+ */`
`187`	`189`	`}`
`188`	`190`	`}`
`189`	`191`
Original file line number	Diff line number	Diff line change
`@@ -2437,6 +2437,13 @@ private void AddFilesToolStripMenuItem_Click(object sender, EventArgs e)`
`2437`	`2437`
`2438`	`2438`	`private void PagesList_AfterLabelEdit(object sender, LabelEditEventArgs e)`
`2439`	`2439`	`{`
	`2440`	`+ if (e.Label == null)`
	`2441`	`+ {`
	`2442`	`+ e.CancelEdit = true;`
	`2443`	`+`
	`2444`	`+ return;`
	`2445`	`+ }`
	`2446`	`+`
`2440`	`2447`	`if (e.Item > -1)`
`2441`	`2448`	`{`
`2442`	`2449`	`ListViewItem changedItem = PagesList.Items[e.Item];`