Avoid accessing non existent dropdown item. Fixes issue #1597.

This commit is contained in:
Ansgar Becker
2010-01-12 18:36:29 +00:00
parent aad22b923c
commit 7aaa5af2c2
2 changed files with 6 additions and 9 deletions

View File

@ -185,16 +185,8 @@ object frmTableTools: TfrmTableTools
Style = csDropDownList Style = csDropDownList
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
ItemHeight = 13 ItemHeight = 13
ItemIndex = 0
TabOrder = 0 TabOrder = 0
Text = 'Check'
OnChange = ValidateControls OnChange = ValidateControls
Items.Strings = (
'Check'
'Analyze'
'Checksum'
'Optimize'
'Repair')
end end
object chkQuick: TCheckBox object chkQuick: TCheckBox
Left = 81 Left = 81

View File

@ -238,6 +238,7 @@ end;
procedure TfrmTableTools.FormShow(Sender: TObject); procedure TfrmTableTools.FormShow(Sender: TObject);
var var
DBNode, TableNode, FirstChecked: PVirtualNode; DBNode, TableNode, FirstChecked: PVirtualNode;
idx: Integer;
begin begin
// When this form is displayed the second time, databases may be deleted or filtered. // When this form is displayed the second time, databases may be deleted or filtered.
// Also, checked nodes must be unchecked and unchecked nodes may need to be checked. // Also, checked nodes must be unchecked and unchecked nodes may need to be checked.
@ -269,8 +270,12 @@ begin
if Assigned(FirstChecked) then if Assigned(FirstChecked) then
TreeObjects.ScrollIntoView(FirstChecked, True); TreeObjects.ScrollIntoView(FirstChecked, True);
// CHECKSUM available since MySQL 4.1.1 // CHECKSUM available since MySQL 4.1.1
idx := comboOperation.ItemIndex;
if idx = -1 then idx := 0;
comboOperation.Items.CommaText := 'Check,Analyze,Checksum,Optimize,Repair';
if Mainform.Connection.ServerVersionInt < 40101 then if Mainform.Connection.ServerVersionInt < 40101 then
comboOperation.Items[comboOperation.Items.IndexOf('Checksum')] := 'Checksum ('+STR_NOTSUPPORTED+')'; comboOperation.Items.Text := StringReplace(comboOperation.Items.Text, 'Checksum', 'Checksum ('+STR_NOTSUPPORTED+')', [rfReplaceAll]);
comboOperation.ItemIndex := idx;
comboOperation.OnChange(Sender); comboOperation.OnChange(Sender);
comboExportOutputType.OnChange(Sender); comboExportOutputType.OnChange(Sender);