diff --git a/MultiTool.Form/frmConfig.vb b/MultiTool.Form/frmConfig.vb index 6d1de6a..a2affc7 100644 --- a/MultiTool.Form/frmConfig.vb +++ b/MultiTool.Form/frmConfig.vb @@ -17,6 +17,7 @@ Public Class frmConfig Private BindingSource As BindingSource = TBEDIXMLITEMSBindingSource Private View As GridView = GridViewItems Private Logger As Logger + Private FormLoading As Boolean = True Private ReadOnly Property Config As Common.Config @@ -49,7 +50,6 @@ Public Class frmConfig Logger.Debug("Connection String: [{0}]", oConnectionString) Logger.Debug("Setting default values") - ' Default Values DS_DD_ECM.TBMT_CONFIG.ADDED_WHOColumn.DefaultValue = Environment.UserName DS_DD_ECM.TBMT_CONFIG.CHANGED_WHOColumn.DefaultValue = Environment.UserName DS_DD_ECM.TBMT_TEMPLATE_ITEMS.ADDED_WHOColumn.DefaultValue = Environment.UserName @@ -57,13 +57,15 @@ Public Class frmConfig Logger.Debug("Initializing Tables Adapter") TBMT_TABLESTableAdapter.Connection.ConnectionString = oConnectionString - TBMT_TABLESTableAdapter.Fill(DS_DD_ECM.TBMT_TABLES) Logger.Debug("Initializing Templates Adapter") TBMT_TEMPLATE_ITEMSTableAdapter.Connection.ConnectionString = oConnectionString Logger.Debug("Initializing Config Adapter") TBMT_CONFIGTableAdapter.Connection.ConnectionString = oConnectionString + + Logger.Debug("Loading Data from Adapters") + TBMT_TABLESTableAdapter.Fill(DS_DD_ECM.TBMT_TABLES) TBMT_CONFIGTableAdapter.Fill(DS_DD_ECM.TBMT_CONFIG) TBMT_CONFIGTableAdapter.FillGeneral(TBMT_CONFIG_GENERAL) @@ -71,6 +73,10 @@ Public Class frmConfig LoadGeneralConfig(TBMT_CONFIG_GENERAL) BindingSource = TBEDIXMLITEMSBindingSource + + FormLoading = False + + GridViewItems.FocusedRowHandle = GridControl.InvalidRowHandle Catch ex As Exception Logger.Error(ex) FormHelper.ShowError(ex, "Laden des Formulars") @@ -191,6 +197,11 @@ Public Class frmConfig Private Sub GridViewTables_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles GridViewTables.FocusedRowChanged Try + If FormLoading Then + Logger.Debug("Form still loading. Exiting.") + Exit Sub + End If + If GridViewTables.FocusedRowHandle < 0 Then Logger.Debug("No row selected. Exiting.") Exit Sub