Avoid crash on startup with markdown code blocks (#45)

TKMM-Team · Aug 31, 2024 · 5fe4253 · 5fe4253
1 parent 1b5c12f
commit 5fe4253
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/Tkmm/Helpers/PageManager.cs b/src/Tkmm/Helpers/PageManager.cs
@@ -27,6 +27,9 @@ public partial class PageManager : ObservableObject
     [ObservableProperty]
     private PageModel? _current = null;
 
+    [ObservableProperty]
+    private Page _default;
+
     private readonly Dictionary<Page, (int Index, bool IsFooter)> _lookup = [];
     public ObservableCollection<PageModel> Pages { get; } = [];
     public ObservableCollection<PageModel> FooterPages { get; } = [];
@@ -51,7 +54,7 @@ public void Register(Page page, string title, object? content, Symbol icon, stri
         });
 
         if (isDefault) {
-            Focus(page);
+            Default = page;
         }
     }
 

diff --git a/src/Tkmm/Models/SplashScreen.cs b/src/Tkmm/Models/SplashScreen.cs
@@ -25,8 +25,6 @@ public async Task RunTasks(CancellationToken cancellationToken)
 
         await Task.WhenAll(tasks);
 
-        PageModel? store = PageManager.Shared.Current;
-        PageManager.Shared.Focus(Page.Settings);
-        PageManager.Shared.Current = store;
+        PageManager.Shared.Focus(PageManager.Shared.Default);
     }
 }