CGit: Workaround: Flush git output when command should be aborted. Still waits for...

diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp
index 4daf111..eecb872 100644 (file)
--- a/src/Git/Git.cpp
+++ b/src/Git/Git.cpp
@@ -290,12 +290,16 @@ int CGit::Run(CGitCall* pcall)
 \r
        DWORD readnumber;\r
        BYTE data[CALL_OUTPUT_READ_CHUNK_SIZE];\r
+       bool bAborted=false;\r
        while(ReadFile(hRead,data,CALL_OUTPUT_READ_CHUNK_SIZE,&readnumber,NULL))\r
        {\r
                //Todo: when OnOutputData() returns 'true', abort git-command. Send CTRL-C signal?\r
-               pcall->OnOutputData(data,readnumber);\r
+               if(!bAborted)//For now, flush output when command aborted.\r
+                       if(pcall->OnOutputData(data,readnumber))\r
+                               bAborted=true;\r
        }\r
-       pcall->OnEnd();\r
+       if(!bAborted)\r
+               pcall->OnEnd();\r
 \r
        \r
        CloseHandle(pi.hThread);\r