From 5b057eeb66bc8a2dca39da964e7210264794964c Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 31 Mar 2022 13:02:09 +0200 Subject: [PATCH] Fix Config crash --- MultiTool.Form/frmConfig.vb | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/MultiTool.Form/frmConfig.vb b/MultiTool.Form/frmConfig.vb index 4cce96b..2584bca 100644 --- a/MultiTool.Form/frmConfig.vb +++ b/MultiTool.Form/frmConfig.vb @@ -32,26 +32,31 @@ Public Class frmConfig End Sub Private Sub frmConfig_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Try + Dim oConnectionString = MSSQLServer.DecryptConnectionString(Config.ConnectionString) + Dim oBuilder As New SqlConnectionStringBuilder(oConnectionString) With { + .InitialCatalog = "DD_ECM" + } - Dim oConnectionString = MSSQLServer.DecryptConnectionString(Config.ConnectionString) - Dim oBuilder As New SqlConnectionStringBuilder(oConnectionString) With { - .InitialCatalog = "DD_ECM" - } + ' 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 + DS_DD_ECM.TBMT_TEMPLATE_ITEMS.CHANGED_WHOColumn.DefaultValue = Environment.UserName - ' 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 - DS_DD_ECM.TBMT_TEMPLATE_ITEMS.CHANGED_WHOColumn.DefaultValue = Environment.UserName + TBMT_TEMPLATE_ITEMSTableAdapter.Connection.ConnectionString = oBuilder.ToString() + TBMT_TEMPLATE_ITEMSTableAdapter.Fill(DS_DD_ECM.TBMT_TEMPLATE_ITEMS) - TBMT_TEMPLATE_ITEMSTableAdapter.Connection.ConnectionString = oBuilder.ToString() - TBMT_TEMPLATE_ITEMSTableAdapter.Fill(DS_DD_ECM.TBMT_TEMPLATE_ITEMS) + TBMT_CONFIGTableAdapter.Connection.ConnectionString = oBuilder.ToString() + TBMT_CONFIGTableAdapter.Fill(DS_DD_ECM.TBMT_CONFIG) + TBMT_CONFIGTableAdapter.FillGeneral(TBMT_CONFIG_GENERAL) - TBMT_CONFIGTableAdapter.Connection.ConnectionString = oBuilder.ToString() - TBMT_CONFIGTableAdapter.Fill(DS_DD_ECM.TBMT_CONFIG) - TBMT_CONFIGTableAdapter.FillGeneral(TBMT_CONFIG_GENERAL) + LoadGeneralConfig(TBMT_CONFIG_GENERAL) - LoadGeneralConfig(TBMT_CONFIG_GENERAL) + BindingSource = TBEDIXMLITEMSBindingSource + Catch ex As Exception + FormHelper.ShowError(ex, "Laden des Formulars") + End Try End Sub Private Sub LoadGeneralConfig(TBMT_CONFIG_GENERAL As DS_DD_ECM.TBMT_CONFIGDataTable) @@ -133,7 +138,7 @@ Public Class frmConfig End Sub Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick - BindingSource.AddNew() + BindingSource?.AddNew() End Sub Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControl1.SelectedPageChanged