From c637d6549cb73a2deae34992b6f7ae8828819512 Mon Sep 17 00:00:00 2001
From: Andy McFadden <fadden@fadden.com>
Date: Sat, 2 Mar 2024 11:17:52 -0800
Subject: [PATCH] Minor updates

---
 SourceGen/MainController.cs              | 3 ++-
 SourceGen/Tools/Omf/OmfFile.cs           | 2 +-
 SourceGen/WpfGui/EditAppSettings.xaml.cs | 2 +-
 docs/sgtutorial/about-disasm.html        | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/SourceGen/MainController.cs b/SourceGen/MainController.cs
index 1b4b9ff..0ae9c2d 100644
--- a/SourceGen/MainController.cs
+++ b/SourceGen/MainController.cs
@@ -256,7 +256,7 @@ namespace SourceGen {
             // Load the settings from the file.  If this fails we have no way to tell the user,
             // so just keep going.
             LoadAppSettings();
-            SetAppWindowLocation();
+            SetAppWindowLocation();     // <-- this causes WindowLoaded to fire
         }
 
         /// <summary>
@@ -1529,6 +1529,7 @@ namespace SourceGen {
 
         public void ShowAppSettings(Window owner, EditAppSettings.Tab initialTab,
                     AsmGen.AssemblerInfo.Id initialAsmId) {
+            // TODO: this can be done in a less-awkward way by subscribing to an event
             EditAppSettings dlg = new EditAppSettings(owner, mMainWin, this,
                 initialTab, initialAsmId);
             dlg.ShowDialog();
diff --git a/SourceGen/Tools/Omf/OmfFile.cs b/SourceGen/Tools/Omf/OmfFile.cs
index 7eb976b..9de8067 100644
--- a/SourceGen/Tools/Omf/OmfFile.cs
+++ b/SourceGen/Tools/Omf/OmfFile.cs
@@ -165,7 +165,7 @@ namespace SourceGen.Tools.Omf {
                 }
                 first = false;
 
-                Debug.Assert(seg.FileLength > 0);
+                Debug.Assert(seg != null && seg.FileLength > 0);
 
                 SegmentList.Add(seg);
                 offset += seg.FileLength;
diff --git a/SourceGen/WpfGui/EditAppSettings.xaml.cs b/SourceGen/WpfGui/EditAppSettings.xaml.cs
index 3473962..1b1da77 100644
--- a/SourceGen/WpfGui/EditAppSettings.xaml.cs
+++ b/SourceGen/WpfGui/EditAppSettings.xaml.cs
@@ -22,6 +22,7 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Input;
 using Microsoft.Win32;
 
 using Asm65;
@@ -30,7 +31,6 @@ using CommonUtil;
 using AssemblerInfo = SourceGen.AsmGen.AssemblerInfo;
 using AssemblerConfig = SourceGen.AsmGen.AssemblerConfig;
 using ExpressionMode = Asm65.Formatter.FormatConfig.ExpressionMode;
-using System.Windows.Input;
 
 namespace SourceGen.WpfGui {
     /// <summary>
diff --git a/docs/sgtutorial/about-disasm.html b/docs/sgtutorial/about-disasm.html
index 2496f3a..4817428 100644
--- a/docs/sgtutorial/about-disasm.html
+++ b/docs/sgtutorial/about-disasm.html
@@ -183,7 +183,7 @@ CopyData  lda   #&lt;addrs               ;get pointer into
 </div>
 
 
-</div> <!-- grid-container -->
+</div> <!-- main -->
 
 <div id="prevnext">
     <a href="using-sourcegen.html" class="btn-next">Next &raquo;</a>