Merge branch 'dev'

winbench · Jun 1, 2018 · 9e9cbc8 · 9e9cbc8
2 parents 9bb3fb5 + e8c6a1f
commit 9e9cbc8
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 9 deletions.
diff --git a/BenchManager/BenchCLI/Properties/AssemblyInfo.cs b/BenchManager/BenchCLI/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.20.0.0")]
-[assembly: AssemblyFileVersion("0.20.0.0")]
+[assembly: AssemblyVersion("0.20.1.0")]
+[assembly: AssemblyFileVersion("0.20.1.0")]
diff --git a/BenchManager/BenchDashboard/AppList.cs b/BenchManager/BenchDashboard/AppList.cs
@@ -111,6 +111,7 @@ private void InitializeAppListColumns()
 
         private void InitializeAppList()
         {
+            if (IsDisposed) return;
             AsyncManager.StartTask(() =>
             {
                 appLookup.Clear();
@@ -207,6 +208,7 @@ private void AnnounceTask(string msg)
 
         private void TaskInfoHandler(TaskInfo info)
         {
+            if (Disposing || IsDisposed) return;
             if (InvokeRequired)
             {
                 BeginInvoke((Action<TaskInfo>)TaskInfoHandler, info);

diff --git a/BenchManager/BenchDashboard/Properties/AssemblyInfo.cs b/BenchManager/BenchDashboard/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.20.0.0")]
-[assembly: AssemblyFileVersion("0.20.0.0")]
+[assembly: AssemblyVersion("0.20.1.0")]
+[assembly: AssemblyFileVersion("0.20.1.0")]
diff --git a/BenchManager/BenchDashboard/SetupForm.cs b/BenchManager/BenchDashboard/SetupForm.cs
@@ -154,8 +154,14 @@ private void CoreAppStateChangedHandler(object sender, AppEventArgs e)
             UpdatePendingCounts();
         }
 
+        private DateTime lastPendingCount = DateTime.Now;
+        private TimeSpan pendingCountInterval = new TimeSpan(0, 0, 2);
+
         private void UpdatePendingCounts()
         {
+            var now = DateTime.Now;
+            if (core.Busy && now < lastPendingCount + pendingCountInterval) return;
+            lastPendingCount = now;
             var downloadIDs = new List<string>();
             var uninstallIDs = new List<string>();
             var installIDs = new List<string>();
@@ -440,6 +446,7 @@ private void AppListTaskInfoHandler(object sender, TaskInfoEventArgs ea)
 
         private void TaskInfoHandler(TaskInfo info)
         {
+            if (Disposing || IsDisposed) return;
             if (InvokeRequired)
                 BeginInvoke((Action<TaskInfo>)ProcessTaskInfo, info);
             else
@@ -449,6 +456,7 @@ private void TaskInfoHandler(TaskInfo info)
         private void ProcessTaskInfo(TaskInfo info)
         {
             lblInfo.Text = info.Message;
+            lblInfo.Refresh();
             if (info is TaskProgress progressInfo) UpdateProgressBar(progressInfo.Progress);
             if (info is TaskError taskError) toolTip.SetToolTip(picState, taskError.Message);
             taskInfoList.AddTaskInfo(info);

diff --git a/BenchManager/BenchLib/BenchEnvironment.cs b/BenchManager/BenchLib/BenchEnvironment.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Threading.Tasks;
 using Microsoft.Win32;
 
 namespace Mastersign.Bench
@@ -459,7 +460,7 @@ private static void SetEnvironmentVar(string name, string value, bool expand = f
             {
                 key.SetValue(name, value, expand ? RegistryValueKind.ExpandString : RegistryValueKind.String);
             }
-            NotifyWindowsAboutSettingChange();
+            Task.Run((Action)NotifyWindowsAboutSettingChange);
         }
 
         private static void DeleteEnvironmentVar(string name)

diff --git a/BenchManager/BenchLib/Properties/AssemblyInfo.cs b/BenchManager/BenchLib/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.20.0.0")]
-[assembly: AssemblyFileVersion("0.20.0.0")]
+[assembly: AssemblyVersion("0.20.1.0")]
+[assembly: AssemblyFileVersion("0.20.1.0")]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,16 @@ Add a link to the GitHub diff like
 
 [Unreleased]: https://github.com/mastersign/bench/compare/master...dev
 
+## [0.20.1] - 2018-06-01
+
+[0.20.1]: https://github.com/mastersign/bench/compare/v0.20.0...v0.20.1
+
+### Added
+- Minor performance improvements
+
+### Fixed
+- Main window crashes when closing setup dialog
+
 ## [0.20.0] - 2018-06-01
 
 [0.20.0]: https://github.com/mastersign/bench/compare/v0.19.0...v0.20.0

diff --git a/res/bench-install.bat b/res/bench-install.bat
@@ -7,7 +7,7 @@ SetLocal
 :: https://winbench.org/guide/setup/
 ::
 
-SET VERSION=0.20.0
+SET VERSION=0.20.1
 SET TAG=v%VERSION%
 SET ROOT=%~dp0
 IF [%1] NEQ [] SET ROOT=%~dpnx1\

diff --git a/res/version.txt b/res/version.txt
@@ -1 +1 @@
-0.20.0
+0.20.1