diff --git a/Business/Menus.cs b/Business/Menus.cs index 5c9b191..674617a 100644 --- a/Business/Menus.cs +++ b/Business/Menus.cs @@ -112,6 +112,8 @@ namespace SystemTrayMenu.Business { workerSubMenu.CancelAsync(); } + + LoadStopped(); } waitToOpenMenu.StartLoadMenu += StartLoadMenu; @@ -243,6 +245,7 @@ namespace SystemTrayMenu.Business waitLeave.Dispose(); IconReader.Dispose(); DisposeMenu(menus[0]); + loadingRowData?.Dispose(); } internal static MenuData GetData(BackgroundWorker worker, string path, int level) diff --git a/Packaging/Package.appxmanifest b/Packaging/Package.appxmanifest index 523bd90..dbaaa83 100644 --- a/Packaging/Package.appxmanifest +++ b/Packaging/Package.appxmanifest @@ -9,7 +9,7 @@ + Version="1.0.9.0" /> SystemTrayMenu diff --git a/Packaging/Packaging.wapproj b/Packaging/Packaging.wapproj index cde85d5..6b92653 100644 --- a/Packaging/Packaging.wapproj +++ b/Packaging/Packaging.wapproj @@ -55,7 +55,7 @@ False True True - x64 + x86 https://github.com/Hofknecht/SystemTrayMenu/releases 0 diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index c51ec9b..ad14a40 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -39,5 +39,5 @@ using System.Runtime.InteropServices; // 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.11.5.0")] -[assembly: AssemblyFileVersion("0.11.5.0")] +[assembly: AssemblyVersion("1.0.9.0")] +[assembly: AssemblyFileVersion("1.0.9.0")] diff --git a/Utilities/File/IconReader.cs b/Utilities/File/IconReader.cs index ac65877..6450564 100644 --- a/Utilities/File/IconReader.cs +++ b/Utilities/File/IconReader.cs @@ -111,7 +111,8 @@ namespace SystemTrayMenu.Utilities ref shfi, (uint)Marshal.SizeOf(shfi), flags); - if (success != IntPtr.Zero) + if (success != IntPtr.Zero && + shfi.hIcon != IntPtr.Zero) { try {