From 026970b0982ec3b714983be8e9c73f737faa5fe9 Mon Sep 17 00:00:00 2001
From: tvannini <tvannini@janox.it>
Date: Fri, 22 Sep 2023 17:30:00 +0200
Subject: [PATCH] >INT Fixed Git integration with net drivers

---
 work.pas | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/work.pas b/work.pas
index 725d280..7bd35d6 100644
--- a/work.pas
+++ b/work.pas
@@ -3330,7 +3330,7 @@ function Tf_work.cvs_checkout(ObjFile: String): Boolean;
 
 function Tf_work.cvs_checkin(ObjFile, TmpFile: String): Boolean;
 var
-  checkinBat, Params, gitBat: string;
+  checkinBat, Params, gitBat, saveDir: string;
   cvsSet, ResCode: Boolean;
   gitCmd: TStringList;
 begin
@@ -3361,8 +3361,8 @@ function Tf_work.cvs_checkin(ObjFile, TmpFile: String): Boolean;
     begin
       ObjFile := Copy(ObjFile, 1, length(ObjFile) - 1) + '*';
     end;
-    gitCmd := TStringList.Create;
-    gitCmd.Add('cd ' + f_work.prgdir);
+    saveDir := GetCurrentDir();
+    gitCmd  := TStringList.Create;
     gitCmd.Add('git add ' + f_work.prgdir + ObjFile);
     gitCmd.Add('git commit ' + f_work.prgdir + ObjFile +
                ' --file=' + TmpFile +
@@ -3372,11 +3372,14 @@ function Tf_work.cvs_checkin(ObjFile, TmpFile: String): Boolean;
       // ___________________________________________________ Execute command ___
     try
     begin
+      SetCurrentDir(f_work.prgdir);
       ExecAndWait(gitBat);
+      SetCurrentDir(saveDir);
       ResCode := true;
     end
     except on E : Exception do
       begin
+        SetCurrentDir(saveDir);
         ShowMessage(E.Message);
         ResCode := false;
       end;