From 2204e2d519b8019c1e455d30c2660c2feb4a3ef4 Mon Sep 17 00:00:00 2001
From: Bush2021 <79072750+Bush2021@users.noreply.github.com>
Date: Fri, 6 Dec 2024 12:31:19 -0500
Subject: [PATCH] fix: skip redundant operations when GetLaunchOn[Startup/Exit]
 are empty

`WaitForSingleObject` causes the IDM floating bar to not display (#130). This commit attempts to avoid calling `WaitForSingleObject` and advises end users to avoid using this function until a better method is implemented.
---
 src/chrome++.ini | Bin 12004 -> 12478 bytes
 src/portable.h   |  20 ++++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/chrome++.ini b/src/chrome++.ini
index 203eb89b63b1bea573bfe894358c60bde68a4e84..bec0d65a592d56ed2b58e1ff32a20b6308fb01b2 100644
GIT binary patch
delta 461
zcmYk2KTE?<6vZ!&(%8i*AY|+yBDhr$6c>@cLKl%xF>MkPnm^JcmI_h@2cbiUf`Ws7
z07VK;E`AHa(ZPbV6a=Znb6;ANz<W98p8Mn8_g;NA24h88C5;4y6q7~8{*}7WaVdfq
z!EwpMr%^(I)CSd{EjR`o6L*$vK!w!8si7;xSw|v44`*X?<h@0kRD!m_2vKK#KnHMY
zP)(UcZ%4vnNK@hu5jUt!OQg^&@wgkn*+4WWqcFe%j#preFO`GD--s?;CRwr?$gD|=
zNW1u-F2ZZ9vt)D~!k@%VXoh9m{ogEm0ULGRDB;fjm!dm7=!cg#)O6Urt^Az6_7t&l
ze68owdGT2tw$$=iADwA5eU<zDz|T8x){D1h7uz$-g`JUovU`5?1n2JJMju4mqEyMH
Uium4p=yuA5#B4D4QOsRxza~j?r2qf`

delta 20
ccmdm&_#}42AKuARgv2H{@H=eQ5tyU^0B4Q}YybcN

diff --git a/src/portable.h b/src/portable.h
index d9fe854..544b5fe 100644
--- a/src/portable.h
+++ b/src/portable.h
@@ -72,7 +72,8 @@ std::wstring GetCommand(LPWSTR param) {
 HANDLE hMutex = nullptr;
 bool IsFirstRun() {
   DWORD pid = GetCurrentProcessId();
-  std::wstring mutex_name = L"Global\\ChromePlusFirstRunMutex" + std::to_wstring(pid);
+  std::wstring mutex_name =
+      L"Global\\ChromePlusFirstRunMutex" + std::to_wstring(pid);
   hMutex = CreateMutexW(nullptr, TRUE, mutex_name.c_str());
   if (hMutex == nullptr || GetLastError() == ERROR_ALREADY_EXISTS) {
     return false;
@@ -110,10 +111,13 @@ void KillLaunchOnExit(std::vector<HANDLE>* program_handles) {
 }
 
 void Portable(LPWSTR param) {
-  std::vector<HANDLE> program_handles = {nullptr};
   bool first_run = IsFirstRun();
-  if (first_run) {
-    LaunchCommands(GetLaunchOnStartup(), SW_SHOW, &program_handles);
+  auto launch_on_startup = GetLaunchOnStartup();
+  auto launch_on_exit = GetLaunchOnExit();
+  std::vector<HANDLE> program_handles = {nullptr};
+
+  if (first_run && !launch_on_startup.empty()) {
+    LaunchCommands(launch_on_startup, SW_SHOW, &program_handles);
   }
 
   wchar_t path[MAX_PATH];
@@ -129,11 +133,15 @@ void Portable(LPWSTR param) {
   sei.lpParameters = args.c_str();
 
   if (ShellExecuteEx(&sei)) {
-    if (first_run) {
+    if (first_run && !launch_on_exit.empty()) {
+      // `WaitForSingleObject` causes IDM floating bar not to be displayed.
+      // Hence, end users should be reminded to avoid using this feature until a
+      // better method is implemented. See:
+      // https://github.com/Bush2021/chrome_plus/issues/130
       WaitForSingleObject(sei.hProcess, INFINITE);
       CloseHandle(hMutex);
       KillLaunchOnExit(&program_handles);
-      LaunchCommands(GetLaunchOnExit(), SW_HIDE, nullptr);
+      LaunchCommands(launch_on_exit, SW_HIDE, nullptr);
     }
     ExitProcess(0);
   }