Merge pull request winsw#417 from NextTurn/setstatus

Fix `<waithint>` setting
cold11 · May 10, 2020 · f4c5f82 · f4c5f82
2 parents 3ca7066 + e37c641
commit f4c5f82
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/src/Core/ServiceWrapper/Main.cs b/src/Core/ServiceWrapper/Main.cs
@@ -367,7 +367,6 @@ private void StopIt()
                 Log.Debug("WaitForProcessToExit " + _process.Id + "+" + stopProcess.Id);
                 WaitForProcessToExit(_process);
                 WaitForProcessToExit(stopProcess);
-                SignalShutdownComplete();
             }
 
             // Stop extensions
@@ -429,12 +428,7 @@ private void SignalShutdownPending()
                 effectiveWaitHint = (int)_descriptor.WaitHint.TotalMilliseconds;
             }
 
-            IntPtr handle = ServiceHandle;
-            _wrapperServiceStatus.checkPoint++;
-            _wrapperServiceStatus.waitHint = effectiveWaitHint;
-            // WriteEvent("SignalShutdownPending " + wrapperServiceStatus.checkPoint + ":" + wrapperServiceStatus.waitHint);
-            _wrapperServiceStatus.currentState = (int)State.SERVICE_STOP_PENDING;
-            Advapi32.SetServiceStatus(handle, _wrapperServiceStatus);
+            RequestAdditionalTime(effectiveWaitHint);
         }
 
         private void SignalShutdownComplete()