Merge pull request #2400 from akruphi/revert

Revert commit (from far2m / Mantis 0002845)
elfmz · Sep 29, 2024 · edba9b4 · edba9b4
2 parents 9b37a21 + ea0490a
commit edba9b4
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/far2l/src/fnparce.cpp b/far2l/src/fnparce.cpp
@@ -377,8 +377,12 @@ int SubstFileName(FARString &strStr,	// результирующая строк
 
 	PSubstData->PreserveLFN = FALSE;
 	PSubstData->PassivePanel = FALSE;	// первоначально речь идет про активную панель!
+	FARString strTmp = strStr;
 
-	const wchar_t *CurStr = strStr;
+	if (!IgnoreInput)
+		ReplaceVariables(strTmp,PSubstData);
+
+	const wchar_t *CurStr = strTmp;
 	FARString strOut;
 
 	while (*CurStr) {
@@ -392,9 +396,6 @@ int SubstFileName(FARString &strStr,	// результирующая строк
 
 	strStr = strOut;
 
-	if (!IgnoreInput)
-		ReplaceVariables(strStr, PSubstData);
-
 	return (PSubstData->PreserveLFN);
 }