Uprava CreateWaitableTimer pri uzavreni timeru (Rootvin)

_custom/Rootvin/winSvc/impl.inc

@@ -19,23 +19,24 @@
  destructor THeoRTNZapisObjMatThread.Destroy;
   begin
 {$IFDEF DEBUG}
-   Write('Ukoncuji thread RTN Zapis objednavka materialu do ExpPr...');
+   Write ('Ukoncuji thread RTN Zapis objednavka materialu do ExpPr...');
 {$ENDIF}
    try
-    if (FTimer<>0) then
-     CloseHandle (FTimer);
-    FTermEvent.Free;
+     if (FTimer<>0) then
+      if WaitForSingleObject(FTimer, 0) <> WAIT_FAILED then
+       CloseHandle (FTimer);
+     FTermEvent.Free;
     finally
-   end;
-   FRunning := false;
-   FMainService := nil;
-   FDataMod := nil;
-   Terminate;
-   FLock.Free;
-   inherited;
+     FRunning := false;
+     FMainService := nil;
+     FDataMod := nil;
+     Terminate;
+     FLock.Free;
+     inherited;
 {$IFDEF DEBUG}
-   WriteLn('OK');
+     WriteLn ('OK');
 {$ENDIF}
+   end;
   end;
 
 
@@ -182,8 +183,8 @@
                     begin
                      inProg:= true;
 
-                     lSQL:= 'DECLARE @errMsg NVARCHAR(500)=N''''' + CRLF +'IF OBJECT_ID(N''dbo.ep_Vyroba_GenObjednavkuMatDoVyrobyNew'', N''P'') IS NOT NULL' + CRLF
-                          + ' EXEC dbo.ep_Vyroba_GenObjednavkuMatDoVyrobyNew @errMsg OUT' + CRLF + 'SELECT @errMsg AS ErrMsg';
+                     lSQL:= 'DECLARE @eMsg NVARCHAR(500)=N''''' + CRLF +'IF OBJECT_ID(N''dbo.ep_Vyroba_GenObjednavkuMatDoVyrobyNew'', N''P'') IS NOT NULL' + CRLF
+                          + ' EXEC dbo.ep_Vyroba_GenObjednavkuMatDoVyrobyNew @zaPocetDnu=5, @errMsg=@eMsg OUT' + CRLF + 'SELECT @eMsg AS ErrMsg';
 
                      lQry.Open(lSQL);
                      if (lQry.RecordCount>0) then