mirrors/PersistentWindows
1
0
Fork 0
mirror of https://github.com/kangyu-california/PersistentWindows.git synced 2025-05-11 21:15:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

#288, relaunch PW if taskbar is not ready to show icon

Browse source
This commit is contained in:
Kang Yu 2024-02-04 16:44:07 -08:00
parent e70840c687
commit fa4f8c8d31
2 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Ninjacrab.PersistentWindows.Solution/Common/PersistentWindowProcessor.cs
View file

@ -220,11 +220,6 @@ namespace PersistentWindows.Common
process = Process.GetCurrentProcess(); process = Process.GetCurrentProcess();
processPriority = process.PriorityClass; processPriority = process.PriorityClass;
while (String.IsNullOrEmpty(GetDisplayKey()))
{
Thread.Sleep(5000);
}
string productName = System.Windows.Forms.Application.ProductName; string productName = System.Windows.Forms.Application.ProductName;
appDataFolder = redirectAppDataFolder ? "." : appDataFolder = redirectAppDataFolder ? "." :
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), productName); Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), productName);

30
Ninjacrab.PersistentWindows.Solution/SystrayShell/Program.cs
View file

@ -241,6 +241,10 @@ namespace PersistentWindows.SystrayShell
#endif #endif
AppdataFolder = appDataFolder; AppdataFolder = appDataFolder;
bool ready = WaitTaskbarReady();
if (!ready)
return;
// default icons // default icons
IdleIcon = legacy_icon ? Properties.Resources.pwIcon2 : Properties.Resources.pwIcon; IdleIcon = legacy_icon ? Properties.Resources.pwIcon2 : Properties.Resources.pwIcon;
var iconHandle = Properties.Resources.pwIconBusy.GetHicon(); var iconHandle = Properties.Resources.pwIconBusy.GetHicon();
@ -329,7 +333,33 @@ namespace PersistentWindows.SystrayShell
} }
Application.Run(); Application.Run();
}
static bool WaitTaskbarReady()
{
if (Gui == false)
return true;
try
{
IntPtr taskbar = User32.FindWindowA("Shell_TrayWnd", null);
IntPtr hWndTrayNotify = User32.FindWindowEx(taskbar, IntPtr.Zero, "TrayNotifyWnd", null);
IntPtr hWndSysPager = User32.FindWindowEx(hWndTrayNotify, IntPtr.Zero, "SysPager", null);
IntPtr hWndToolbar = User32.FindWindowEx(hWndSysPager, IntPtr.Zero, "ToolbarWindow32", null);
if (hWndToolbar != IntPtr.Zero)
return true;
}
catch (Exception )
{
Log.Error("taskbar not ready, restart PersistentWindows");
}
string batFile = Path.Combine(AppdataFolder, $"pw_restart.bat");
string content = "timeout /t 10 /nobreak > NUL";
content += "\nstart \"\" /B \"" + Path.Combine(Application.StartupPath, Application.ProductName) + ".exe\" " + Program.CmdArgs;
File.WriteAllText(batFile, content);
Process.Start(batFile);
return false;
} }
static void ShowRestoreTip() static void ShowRestoreTip()