Make column selection dialog more crash safe against clicks between i…

…tems. Closes #534.
HeidiSQL · Feb 10, 2019 · 0f6b3ff · 0f6b3ff
1 parent 25394f4
commit 0f6b3ff
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/source/column_selection.pas b/source/column_selection.pas
@@ -152,13 +152,19 @@ procedure TColumnSelectionForm.chklistColumnsClickCheck(Sender: TObject);
 var
   i : Integer;
   AllSelected, NoneSelected : Boolean;
+  FocusedItem: String;
+  FocusedItemIndex: Integer;
 begin
   // Add or remove clicked item from list
   if chklistColumns.ItemIndex > -1 then begin
-    if chklistColumns.Checked[chklistColumns.ItemIndex] then
+    FocusedItem := chklistColumns.Items[chklistColumns.ItemIndex];
-      FCheckedColumns.Add(chklistColumns.Items[chklistColumns.ItemIndex])
+    if chklistColumns.Checked[chklistColumns.ItemIndex] then begin
-    else
+      FCheckedColumns.Add(FocusedItem)
-      FCheckedColumns.Delete(FCheckedColumns.IndexOf(chklistColumns.Items[chklistColumns.ItemIndex]));
+    end else begin
+      FocusedItemIndex := FCheckedColumns.IndexOf(FocusedItem);
+      if FocusedItemIndex > -1 then
+        FCheckedColumns.Delete(FocusedItemIndex);
+    end;
   end;
 
   Allselected := True;