From ea0490a29f2c7049d23e4a79f4bfdbab213ec6a9 Mon Sep 17 00:00:00 2001
From: akruphi <92621645+akruphi@users.noreply.github.com>
Date: Fri, 27 Sep 2024 19:07:43 +0300
Subject: [PATCH] Revert commit (from far2m / Mantis 0002845)

 from: https://github.com/shmuz/far2m/commit/5505cd64b07adb89a1cca58cb1b92a1690dbd4b9

 revert https://github.com/elfmz/far2l/commit/31ba3e9160ab63aba51d716fcc322dff38b6d230 as it breaks special symbols from user input dialog
---
 far2l/src/fnparce.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/far2l/src/fnparce.cpp b/far2l/src/fnparce.cpp
index 7cd50befc..e6f984ae4 100644
--- 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);
 }