Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs =================================================================== diff -u -r97cf95f950a48d24dc18b44a38983a93309bf369 -rc4700313fdae1ca31865d5ddca963f871e2e6ef0 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs (.../AssessmentSectionMergeDataProviderDialog.cs) (revision 97cf95f950a48d24dc18b44a38983a93309bf369) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs (.../AssessmentSectionMergeDataProviderDialog.cs) (revision c4700313fdae1ca31865d5ddca963f871e2e6ef0) @@ -24,7 +24,6 @@ using System.Linq; using System.Windows.Forms; using Core.Common.Controls.Dialogs; -using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Integration.Data; using Ringtoets.Integration.Data.Merge; using Ringtoets.Integration.Forms.Properties; @@ -39,7 +38,6 @@ public partial class AssessmentSectionMergeDataProviderDialog : DialogBase, IAssessmentSectionMergeDataProvider { private FailureMechanismMergeDataRow[] failureMechanismMergeDataRows; - private bool assessmentSectionComboBoxUpdating; /// /// Creates a new instance of . @@ -51,6 +49,7 @@ : base(dialogParent, RingtoetsCommonFormsResources.SelectionDialogIcon, 720, 590) { InitializeComponent(); + InitializeComboBox(); InitializeTooltip(); InitializeDataGridView(); } @@ -77,6 +76,11 @@ return cancelButton; } + private void InitializeComboBox() + { + assessmentSectionComboBox.DisplayMember = nameof(AssessmentSection.Name); + } + private void InitializeDataGridView() { dataGridViewControl.AddCheckBoxColumn(nameof(FailureMechanismMergeDataRow.IsSelected), @@ -105,7 +109,7 @@ private void AssessmentSectionComboBox_OnSelectedIndexChanged(object sender, EventArgs eventArgs) { - if (assessmentSectionComboBoxUpdating || assessmentSectionComboBox.SelectedIndex == -1) + if (assessmentSectionComboBox.SelectedIndex == -1) { return; } @@ -120,15 +124,7 @@ private void SetComboBoxData(IEnumerable assessmentSections) { assessmentSectionComboBox.BeginUpdate(); - - assessmentSectionComboBoxUpdating = true; assessmentSectionComboBox.DataSource = assessmentSections.ToArray(); - assessmentSectionComboBox.DisplayMember = nameof(AssessmentSection.Name); - assessmentSectionComboBox.SelectedItem = null; - assessmentSectionComboBoxUpdating = false; - - assessmentSectionComboBox.SelectedItem = assessmentSections.FirstOrDefault(); - assessmentSectionComboBox.EndUpdate(); }