Skip to content

Commit

Permalink
Revert commit (from far2m / Mantis 0002845)
Browse files Browse the repository at this point in the history
 from: shmuz@5505cd6

 revert elfmz@31ba3e9 as it breaks special symbols from user input dialog
  • Loading branch information
akruphi committed Sep 27, 2024
1 parent adca122 commit ea0490a
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions far2l/src/fnparce.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -392,9 +396,6 @@ int SubstFileName(FARString &strStr, // результирующая строк

strStr = strOut;

if (!IgnoreInput)
ReplaceVariables(strStr, PSubstData);

return (PSubstData->PreserveLFN);
}

Expand Down

0 comments on commit ea0490a

Please sign in to comment.