diff --git a/SmartContextMenu/Forms/StartProgramForm.cs b/SmartContextMenu/Forms/StartProgramForm.cs index c0e33e2..f4edc1c 100644 --- a/SmartContextMenu/Forms/StartProgramForm.cs +++ b/SmartContextMenu/Forms/StartProgramForm.cs @@ -37,32 +37,32 @@ private void InitializeControls(StartProgramMenuItem menuItem) chkUseWindowWorkingDirectory.Text = _languageManager.GetString("start_program_use_window_working_directory"); Text = _languageManager.GetString("start_program_form"); - if (menuItem != null) - { - txtTitle.Text = menuItem.Title; - txtFileName.Text = menuItem.FileName; - txtArguments.Text = menuItem.Arguments; - txtBegin.Text = menuItem.BeginParameter; - txtEnd.Text = menuItem.EndParameter; - txtParameter.Text = $"{menuItem.BeginParameter}{_languageManager.GetString("start_program_parameter")}{menuItem.EndParameter}"; - chkShowWindow.Checked = menuItem.ShowWindow; - chkUseWindowWorkingDirectory.Checked = menuItem.UseWindowWorkingDirectory; - } - cmbKey1.ValueMember = "Id"; cmbKey1.DisplayMember = "Text"; cmbKey1.DataSource = EnumExtensions.AsEnumerable().Select(x => new { Id = x, Text = x.GetDescription() }).Where(x => !string.IsNullOrEmpty(x.Text)).ToList(); - cmbKey1.SelectedValue = menuItem.Key1; cmbKey2.ValueMember = "Id"; cmbKey2.DisplayMember = "Text"; cmbKey2.DataSource = EnumExtensions.AsEnumerable().Select(x => new { Id = x, Text = x.GetDescription() }).Where(x => !string.IsNullOrEmpty(x.Text)).ToList(); - cmbKey2.SelectedValue = menuItem.Key2; cmbKey3.ValueMember = "Id"; cmbKey3.DisplayMember = "Text"; cmbKey3.DataSource = EnumExtensions.AsEnumerable().Select(x => new { Id = x, Text = x.GetDescription() }).Where(x => !string.IsNullOrEmpty(x.Text)).ToList(); - cmbKey3.SelectedValue = menuItem.Key3; + + if (menuItem != null) + { + txtTitle.Text = menuItem.Title; + txtFileName.Text = menuItem.FileName; + txtArguments.Text = menuItem.Arguments; + txtBegin.Text = menuItem.BeginParameter; + txtEnd.Text = menuItem.EndParameter; + txtParameter.Text = $"{menuItem.BeginParameter}{_languageManager.GetString("start_program_parameter")}{menuItem.EndParameter}"; + chkShowWindow.Checked = menuItem.ShowWindow; + chkUseWindowWorkingDirectory.Checked = menuItem.UseWindowWorkingDirectory; + cmbKey1.SelectedValue = menuItem.Key1; + cmbKey2.SelectedValue = menuItem.Key2; + cmbKey3.SelectedValue = menuItem.Key3; + } } protected override void OnLoad(EventArgs e)