Browse Source

FIX: Redefine template

Alexander Koblov 4 years ago
parent
commit
5199cf1864
2 changed files with 9 additions and 3 deletions
  1. 1 1
      src/fFindDlg.pas
  2. 8 2
      src/fmaskinputdlg.pas

+ 1 - 1
src/fFindDlg.pas

@@ -578,7 +578,7 @@ begin
       Result := (ShowModal = mrOk);
       if Result and (lbSearchTemplates.Count > 0) then
       begin
-        TemplateName := lbSearchTemplates.Items[lbSearchTemplates.Count - 1];
+        TemplateName := FLastTemplateName;
       end;
     end;
   finally

+ 8 - 2
src/fmaskinputdlg.pas

@@ -175,13 +175,19 @@ end;
 
 procedure TfrmMaskInputDlg.btnDefineTemplateClick(Sender: TObject);
 var
-  sTemplateName: string;
+  Index: Integer;
+  sTemplateName: String;
 begin
   if lbxSearchTemplate.ItemIndex >= 0 then
     sTemplateName := lbxSearchTemplate.Items[lbxSearchTemplate.ItemIndex];
   if ShowDefineTemplateDlg(sTemplateName) then
   begin
-    lbxSearchTemplate.ItemIndex := lbxSearchTemplate.Items.Add(sTemplateName);
+    Index:= lbxSearchTemplate.Items.IndexOf(sTemplateName);
+    if Index >= 0 then
+      lbxSearchTemplate.ItemIndex := Index
+    else begin
+      lbxSearchTemplate.ItemIndex := lbxSearchTemplate.Items.Add(sTemplateName);
+    end;
     cmbMask.Text := cTemplateSign + sTemplateName;
   end;
 end;