Hotfix for not being able to close applicaiton due to wrong app state

t0815 · Aug 21, 2023 · 0df211d · 0df211d
1 parent 30b9066
commit 0df211d
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 7 deletions.
diff --git a/MyCBZ/App.config b/MyCBZ/App.config
@@ -52,7 +52,7 @@
     <applicationSettings>
         <Win_CBZ.Win_CBZSettings>
             <setting name="Version" serializeAs="String">
-                <value>0.11.38b</value>
+                <value>0.11.39b</value>
             </setting>
             <setting name="RenamerPlaceholders" serializeAs="Xml">
                 <value>

diff --git a/MyCBZ/Forms/MainForm.cs b/MyCBZ/Forms/MainForm.cs
@@ -549,6 +549,7 @@ private void HandleGlobalTaskProgress(object sender, GeneralTaskProgressEvent e)
                     newToolStripMenuItem.Enabled = true;
                     applicationStatusLabel.Text = e.Message;
                     Program.ProjectModel.IsChanged = true;
+                    Program.ProjectModel.ApplicationState = ApplicationStatusEvent.STATE_READY;
                 }));
 
                 try
@@ -853,6 +854,8 @@ private void ApplicationStateChanged(object sender, ApplicationStatusEvent e)
             String info = applicationStatusLabel.Text;
             String filename = e.ArchiveInfo.FileName;
 
+            Program.ProjectModel.ApplicationState = e.State;
+
             switch (e.State)
             {
                 case ApplicationStatusEvent.STATE_ANALYZING:
@@ -1273,6 +1276,14 @@ private void NewToolStripMenuItem_Click(object sender, EventArgs e)
                     ClearProject();
                     NewProject();
                 }          
+            } else
+            {
+
+                if (ArchiveProcessing())
+                {
+                    ApplicationMessage.ShowWarning("Please wait until current operation has finished.", "Still operations in progress", 2, ApplicationMessage.DialogButtons.MB_OK);
+
+                }
             }
         }
 

diff --git a/MyCBZ/Models/ProjectModel.cs b/MyCBZ/Models/ProjectModel.cs
@@ -737,6 +737,7 @@ protected void UpdatePageIndicesProc()
             }
 
             OnOperationFinished(new OperationFinishedEvent(0, Pages.Count));
+            OnApplicationStateChanged(new ApplicationStatusEvent(this, ApplicationStatusEvent.STATE_READY));
 
             InitialPageIndexRebuild = false;
         }

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%\CBZMage\Temp\</Value>
     </Setting>
     <Setting Name="Version" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">0.11.38b</Value>
+      <Value Profile="(Default)">0.11.39b</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
@@ -29,7 +29,7 @@ Microsoft Visual Studio [Community] 2022 (64-Bit)
 
 ## Latest Release
 
-v0.11.38b released!
+v0.11.39b released!
 
 ## Third party components
 

diff --git a/Win_CBZ-Setup/Win_CBZ-Setup.vdproj b/Win_CBZ-Setup/Win_CBZ-Setup.vdproj
@@ -434,15 +434,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Win_CBZ"
-        "ProductCode" = "8:{91A0603F-CAEA-4797-B116-A80CB212D2A6}"
-        "PackageCode" = "8:{BC051103-77AB-49F2-96D7-4CC34BC8DB9D}"
+        "ProductCode" = "8:{1EEF3E0F-57DA-42C8-82AF-A7F68635525D}"
+        "PackageCode" = "8:{782DBDB6-7C01-4C0D-B941-4358CD081C70}"
         "UpgradeCode" = "8:{813B9659-6DDC-4083-B56B-0400F17E8B45}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:0.11.38"
+        "ProductVersion" = "8:0.11.39"
         "Manufacturer" = "8:Trash_s0Ft"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
-Original file line number
+Diff line change
@@ Expand Up / @@ -737,6 +737,7 @@ protected void UpdatePageIndicesProc() @@
                 }
                 OnOperationFinished(new OperationFinishedEvent(0, Pages.Count));
+                OnApplicationStateChanged(new ApplicationStatusEvent(this, ApplicationStatusEvent.STATE_READY));
                 InitialPageIndexRebuild = false;
             }
@@ Expand Down @@