Merge branch 'WatchdogCore'
This commit is contained in:
@@ -420,9 +420,9 @@ bool CApplication::Run( bool TerminateOnError )
|
|||||||
{
|
{
|
||||||
ProcessTerminate = !FunctionItem->Function->Process();
|
ProcessTerminate = !FunctionItem->Function->Process();
|
||||||
if (TerminateOnError) {
|
if (TerminateOnError) {
|
||||||
if (ProcessTerminate)
|
if (ProcessTerminate) // Raise terminate flag for other processes
|
||||||
Terminate = true;
|
Terminate = true;
|
||||||
if (FunctionItem->Function->WaitToTerminate && !ProcessTerminate)
|
if (FunctionItem->Function->WaitToTerminate && !ProcessTerminate) // If needed, allow process to terminate cleanly
|
||||||
CleanTerminate = false;
|
CleanTerminate = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user