From 2450977fc352e82fddd2cc44d8ed4452d6fd60b7 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 7 Apr 2021 12:27:04 +0200 Subject: [PATCH] GlobalIndexer: Revert setting up handler before default value --- GUIs.GlobalIndexer/ControlCreator.vb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/GUIs.GlobalIndexer/ControlCreator.vb b/GUIs.GlobalIndexer/ControlCreator.vb index 9481d160..15f9a689 100644 --- a/GUIs.GlobalIndexer/ControlCreator.vb +++ b/GUIs.GlobalIndexer/ControlCreator.vb @@ -187,10 +187,6 @@ 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) @@ -208,6 +204,8 @@ 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