mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: In MultiRename tool, when using the helper to enter the "[V:hint]" placeholder and prompting the user to enter a variable name, if user was pressing the "Cancel" button, it was still inserting the mask.

Browse source 
FIX: In MultiRename tool, when launching the file rename process and there was at least one variable value for a "[V]" placeholder, if user was hitting "Cancel" when prompt to enter variable value, it was still doing the actual file renaming.
This commit is contained in:
Denis Bisson 2020-01-09 01:39:00 +00:00
commit 4e54cefc5b
1 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/fmultirename.pas
View file

@ -1631,10 +1631,12 @@ var
sVariableName: string;
begin
sVariableName := rsSimpleWordVariable;
InputQuery(rsMulRenDefineVariableName, rsMulRenEnterNameForVar, sVariableName);
if sVariableName = '' then
sVariableName := rsSimpleWordVariable;
InsertMask('[V:' + sVariableName + ']', tTargetForMask(TMenuItem(Sender).Tag and iTARGETMASK));
if InputQuery(rsMulRenDefineVariableName, rsMulRenEnterNameForVar, sVariableName) then
begin
if sVariableName = '' then
sVariableName := rsSimpleWordVariable;
InsertMask('[V:' + sVariableName + ']', tTargetForMask(TMenuItem(Sender).Tag and iTARGETMASK));
end;
end;
{ TfrmMultiRename.MenuItemStraightMaskClick }
@ -1851,13 +1853,21 @@ begin
sVariableValue := FslVariableSuggestionValue.Strings[iVariableSuggestionIndex]
else
sVariableValue := sVariableName;
InputQuery(rsMulRenDefineVariableValue, Format(rsMulRenEnterValueForVar, [sVariableName]), sVariableValue);
FslVariableNames.Add(sVariableName);
iVariableIndex := FslVariableValues.Add(sVariableValue);
if iVariableSuggestionIndex = -1 then
if InputQuery(rsMulRenDefineVariableValue, Format(rsMulRenEnterValueForVar, [sVariableName]), sVariableValue) then
begin
FslVariableSuggestionName.Add(sVariableName);
FslVariableSuggestionValue.Add(sVariableValue);
FslVariableNames.Add(sVariableName);
iVariableIndex := FslVariableValues.Add(sVariableValue);
if iVariableSuggestionIndex = -1 then
begin
FslVariableSuggestionName.Add(sVariableName);
FslVariableSuggestionValue.Add(sVariableValue);
end;
end
else
begin
FActuallyRenamingFile := False;
exit;
end;
end;
Result := FslVariableValues.Strings[iVariableIndex];
@ -2375,6 +2385,10 @@ begin
AFile := TFile.Create(EmptyStr);
AFile.Name := FreshText(I);
//In "FreshText", if there was a "Variable on the fly / [V:Hint]" and the user aborted it, the "FActuallyRenamingFile" will be cleared and so we abort the actual renaming process.
if not FActuallyRenamingFile then
Exit;
// Checking duplicates
NewName := FFiles[I].Path + AFile.Name;
J := FNewNames.Find(NewName);