CodeMirror/SystemTrayMenu
1
0
Fork 0
mirror of https://github.com/Hofknecht/SystemTrayMenu.git synced 2024-06-09 22:15:09 +12:00
Code Issues Projects Releases Wiki Activity

#101, #109, version 1.0.9.0

Browse source 
[Feature] Windows Store (#101)
[Feature] Code Analyze and Refactor 0.12 (#109)
This commit is contained in:
Markus Hofknecht 2020-07-11 17:57:14 +02:00
parent af05e3ba2d
commit b595ecbe8a
5 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Business/Menus.cs
View file

@ -112,6 +112,8 @@ namespace SystemTrayMenu.Business
{ {
workerSubMenu.CancelAsync(); workerSubMenu.CancelAsync();
} }
LoadStopped();
} }
waitToOpenMenu.StartLoadMenu += StartLoadMenu; waitToOpenMenu.StartLoadMenu += StartLoadMenu;
@ -243,6 +245,7 @@ namespace SystemTrayMenu.Business
waitLeave.Dispose(); waitLeave.Dispose();
IconReader.Dispose(); IconReader.Dispose();
DisposeMenu(menus[0]); DisposeMenu(menus[0]);
loadingRowData?.Dispose();
} }
internal static MenuData GetData(BackgroundWorker worker, string path, int level) internal static MenuData GetData(BackgroundWorker worker, string path, int level)

2
Packaging/Package.appxmanifest
View file

@ -9,7 +9,7 @@
<Identity <Identity
Name="49543SystemTrayMenu.SystemTrayMenu" Name="49543SystemTrayMenu.SystemTrayMenu"
Publisher="CN=5884501C-92ED-45DE-9508-9D987C314243" Publisher="CN=5884501C-92ED-45DE-9508-9D987C314243"
Version="1.0.4.0" /> Version="1.0.9.0" />
<Properties> <Properties>
<DisplayName>SystemTrayMenu</DisplayName> <DisplayName>SystemTrayMenu</DisplayName>

2
Packaging/Packaging.wapproj
View file

@ -55,7 +55,7 @@
<GenerateAppInstallerFile>False</GenerateAppInstallerFile> <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision> <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
<GenerateTestArtifacts>True</GenerateTestArtifacts> <GenerateTestArtifacts>True</GenerateTestArtifacts>
<AppxBundlePlatforms>x64</AppxBundlePlatforms> <AppxBundlePlatforms>x86</AppxBundlePlatforms>
<AppInstallerUri>https://github.com/Hofknecht/SystemTrayMenu/releases</AppInstallerUri> <AppInstallerUri>https://github.com/Hofknecht/SystemTrayMenu/releases</AppInstallerUri>
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks> <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
</PropertyGroup> </PropertyGroup>

4
Properties/AssemblyInfo.cs
View file

@ -39,5 +39,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.11.5.0")] [assembly: AssemblyVersion("1.0.9.0")]
[assembly: AssemblyFileVersion("0.11.5.0")] [assembly: AssemblyFileVersion("1.0.9.0")]

3
Utilities/File/IconReader.cs
View file

@ -111,7 +111,8 @@ namespace SystemTrayMenu.Utilities
ref shfi, ref shfi,
(uint)Marshal.SizeOf(shfi), (uint)Marshal.SizeOf(shfi),
flags); flags);
if (success != IntPtr.Zero) if (success != IntPtr.Zero &&
shfi.hIcon != IntPtr.Zero)
{ {
try try
{ {