From ec8c0c7cd9766876aa41a64919018e63a83d467c Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 6 Apr 2021 14:21:21 +0200 Subject: [PATCH] GlobalIndexer: Setup oncontrolchanged handler before default value --- GUIs.GlobalIndexer/ControlCreator.vb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/GUIs.GlobalIndexer/ControlCreator.vb b/GUIs.GlobalIndexer/ControlCreator.vb index 15f9a689..9481d160 100644 --- a/GUIs.GlobalIndexer/ControlCreator.vb +++ b/GUIs.GlobalIndexer/ControlCreator.vb @@ -187,6 +187,10 @@ Public Class ControlCreator oControl.Properties.PreventDuplicates = pPreventDuplicateValues oControl.Properties.AppearanceFocused.BackColor = HightlightColor + ' Add Handler before assigning Default Value so + ' OnControlChanged will fire for default values as well + AddHandler oControl.Properties.SelectedValuesChanged, Sub() OnControlChanged.Invoke(oControl) + If Not String.IsNullOrEmpty(pDefaultValue) Then Dim oDefaultValues As New List(Of String) @@ -204,8 +208,6 @@ Public Class ControlCreator oControl.Properties.SelectedValues = oDefaultValues End If - AddHandler oControl.Properties.SelectedValuesChanged, Sub() OnControlChanged.Invoke(oControl) - If OnLookupData Is Nothing Then Logger.Warn("LookupGrid Datasource could not be set, OnLookupData Function is not defined!") End If