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

#288, wait for taskbar ready only once to avoid dead loop

Browse source
This commit is contained in:
Kang Yu 2024-02-19 23:37:34 -08:00
parent 93611c447b
commit 3c3b6b49db
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -69,6 +69,7 @@ namespace PersistentWindows.SystrayShell
bool check_upgrade = true; bool check_upgrade = true;
bool auto_upgrade = false; bool auto_upgrade = false;
bool legacy_icon = false; bool legacy_icon = false;
bool waiting_taskbar = false;
foreach (var arg in args) foreach (var arg in args)
{ {
@ -141,6 +142,9 @@ namespace PersistentWindows.SystrayShell
case "-delay_start": case "-delay_start":
delay_start = 1; delay_start = 1;
break; break;
case "-wait_taskbar":
waiting_taskbar = true;
break;
case "-delay_manual_capture": case "-delay_manual_capture":
delay_manual_capture = 1; delay_manual_capture = 1;
break; break;
@ -244,9 +248,12 @@ namespace PersistentWindows.SystrayShell
#endif #endif
AppdataFolder = appDataFolder; AppdataFolder = appDataFolder;
bool ready = WaitTaskbarReady(); if (!waiting_taskbar)
if (!ready) {
return; 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;
@ -359,7 +366,7 @@ namespace PersistentWindows.SystrayShell
string batFile = Path.Combine(AppdataFolder, $"pw_restart.bat"); string batFile = Path.Combine(AppdataFolder, $"pw_restart.bat");
string content = "timeout /t 10 /nobreak > NUL"; string content = "timeout /t 10 /nobreak > NUL";
content += "\nstart \"\" /B \"" + Path.Combine(Application.StartupPath, Application.ProductName) + ".exe\" " + Program.CmdArgs; content += "\nstart \"\" /B \"" + Path.Combine(Application.StartupPath, Application.ProductName) + ".exe\" " + "-wait_taskbar " + Program.CmdArgs;
File.WriteAllText(batFile, content); File.WriteAllText(batFile, content);
Process.Start(batFile); Process.Start(batFile);
return false; return false;