NRE under certain themes. Fix #1899

Analogy-LogViewer · Nov 22, 2023 · 176d735 · 176d735
1 parent 3a14a03
commit 176d735
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/Analogy.CommonControls/UserControls/LogMessagesUC.cs b/Analogy.CommonControls/UserControls/LogMessagesUC.cs
@@ -1504,21 +1504,26 @@ private void LoadUISettings()
             logGrid.OptionsFind.Behavior = Settings.BuiltInSearchPanelMode == BuiltInSearchPanelMode.Search
                 ? FindPanelBehavior.Search
                 : FindPanelBehavior.Filter;
-            gridColumnDate.SortOrder =
-                Settings.DefaultDescendOrder ? ColumnSortOrder.Descending : ColumnSortOrder.Ascending;
-            txtbInclude.MaskBox.AutoCompleteMode = AutoCompleteMode.SuggestAppend;
-            txtbInclude.MaskBox.AutoCompleteSource = AutoCompleteSource.CustomSource;
+            gridColumnDate.SortOrder = Settings.DefaultDescendOrder ? ColumnSortOrder.Descending : ColumnSortOrder.Ascending;
+            if (txtbInclude.MaskBox is not null)
+            {
+                txtbInclude.MaskBox.AutoCompleteMode = AutoCompleteMode.SuggestAppend;
+                txtbInclude.MaskBox.AutoCompleteSource = AutoCompleteSource.CustomSource;
+                txtbInclude.MaskBox.AutoCompleteCustomSource = autoCompleteInclude;
+            }
+
             if (Settings.RememberLastSearches)
             {
                 autoCompleteInclude.AddRange(Settings.LastSearchesInclude.ToArray());
                 autoCompleteExclude.AddRange(Settings.LastSearchesExclude.ToArray());
             }
 
-            txtbInclude.MaskBox.AutoCompleteCustomSource = autoCompleteInclude;
-
-            txtbExclude.MaskBox.AutoCompleteMode = AutoCompleteMode.SuggestAppend;
-            txtbExclude.MaskBox.AutoCompleteSource = AutoCompleteSource.CustomSource;
-            txtbExclude.MaskBox.AutoCompleteCustomSource = autoCompleteExclude;
+            if (txtbExclude.MaskBox is not null)
+            {
+                txtbExclude.MaskBox.AutoCompleteMode = AutoCompleteMode.SuggestAppend;
+                txtbExclude.MaskBox.AutoCompleteSource = AutoCompleteSource.CustomSource;
+                txtbExclude.MaskBox.AutoCompleteCustomSource = autoCompleteExclude;
+            }
 
             btswitchRefreshLog.Checked = true;
             LogGrid.BestFitColumns();

diff --git a/Analogy/CommonChangeLog.cs b/Analogy/CommonChangeLog.cs
@@ -9,6 +9,7 @@ public static IEnumerable<AnalogyChangeLog> GetChangeLog()
         {
             return new List<AnalogyChangeLog>
             {
+                new ("V6.0.0 - NRE under certain themes. Fix #1899", AnalogChangeLogType.Bug, "Lior Banai", new DateTime(2023, 11, 22), "6.0.0"),
                 new ("V6.0.0 - Add NET8 support. #1875", AnalogChangeLogType.Improvement, "Lior Banai", new DateTime(2023, 11, 17), "6.0.0"),
                 new ("V5.1.1 - millisecond time is not showing parsed json record. #1866", AnalogChangeLogType.Improvement, "Lior Banai", new DateTime(2023, 10, 27), "5.1.1.0"),
                 new ("V5.1.1 - Fix NLog Parser #1862", AnalogChangeLogType.Bug, "Lior Banai", new DateTime(2023, 10, 26), "5.1.1.0"),

diff --git a/Analogy/Forms/MainForm.cs b/Analogy/Forms/MainForm.cs
@@ -304,7 +304,7 @@ private async void AnalogyMainForm_Load(object sender, EventArgs e)
 
         private void UpdateUpdateButton()
         {
-            bbtnCheckUpdates.Caption = "Latest Version: " + UpdateManager.NewestVersion.ToString();
+            bbtnCheckUpdates.Caption = "Latest Version: " + UpdateManager?.NewestVersion?.ToString();
             if (UpdateManager.NewVersionExist)
             {
                 bbtnCheckUpdates.Appearance.BackColor = Color.GreenYellow;