Merge pull request #88 from ledoge/terminal-fix

Don't inherit current directory when using wt/flute
yuk7 · Jan 26, 2021 · b1d5dce · b1d5dce
2 parents 6e191a1 + ed672b6
commit b1d5dce
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/main.c b/main.c
@@ -168,7 +168,7 @@ int main()
 
                         wcscat_s(Ecmd, ARRAY_LENGTH(Ecmd), L" \"");
                         wcscat_s(Ecmd, ARRAY_LENGTH(Ecmd), efpath);
-                        wcscat_s(Ecmd, ARRAY_LENGTH(Ecmd), L"\" run");
+                        wcscat_s(Ecmd, ARRAY_LENGTH(Ecmd), L"\"");
 
                         FreeConsole();
                         STARTUPINFOW si = {0};
@@ -187,7 +187,7 @@ int main()
 
                         wcscat_s(Ecmd, ARRAY_LENGTH(Ecmd), L" run \"");
                         wcscat_s(Ecmd, ARRAY_LENGTH(Ecmd), efpath);
-                        wcscat_s(Ecmd, ARRAY_LENGTH(Ecmd), L" run\"");
+                        wcscat_s(Ecmd, ARRAY_LENGTH(Ecmd), L"\"");
 
                         FreeConsole();
                         STARTUPINFOW si = {0};

diff --git a/parenttl.h b/parenttl.h
@@ -39,7 +39,8 @@ bool isParentCmdLine()
                 if ((strcmp(pe32.szExeFile, "cmd.exe") == 0) ||
                 (strcmp(pe32.szExeFile, "powershell.exe") == 0) ||
                 (strcmp(pe32.szExeFile, "wsl.exe") == 0) ||
-                (strcmp(pe32.szExeFile, "wt.exe") == 0) )
+                (strcmp(pe32.szExeFile, "WindowsTerminal.exe") == 0) ||
+                (strcmp(pe32.szExeFile, "winpty-agent.exe") == 0) )
                 {
                     if(procsCnt < PROC_LIST_SIZE)
                     {