From 0861d9adb67a056d9e6050e4f2f229975c46dca6 Mon Sep 17 00:00:00 2001
From: TheXamlGuy <dan_clark@outlook.com>
Date: Sun, 12 May 2024 23:21:05 +0100
Subject: [PATCH] Get disposing working for subscription manager

---
 Bitvault.Avalonia/App.axaml.cs        | 5 +++--
 Bitvault.Avalonia/ContainerView.axaml | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Bitvault.Avalonia/App.axaml.cs b/Bitvault.Avalonia/App.axaml.cs
index f68a264..1809207 100644
--- a/Bitvault.Avalonia/App.axaml.cs
+++ b/Bitvault.Avalonia/App.axaml.cs
@@ -9,7 +9,6 @@ using Toolkit.Foundation;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using HotAvalonia;
 using Bitvault.Data;
-using System.Collections;
 using System.Collections.Generic;
 
 namespace Bitvault.Avalonia;
@@ -43,7 +42,9 @@ public partial class App : Application
                 {
                     args.AddServices(services =>
                     {
-                        services.AddTransient<IComparer<Item>>(provider => Comparer<Item>.Create((x, z) => x.Name!.CompareTo(z.Name)));
+                        services.AddTransient<IComparer<Item>>(provider => Comparer<Item>.Create((x, z) => 
+                            x.Name!.CompareTo(z.Name) == 0 ? 1 : x.Name!.CompareTo(z.Name)));
+
                         services.AddCache<Item>();
 
                         services.AddTransient<IKeyGenerator, KeyGenerator>();
diff --git a/Bitvault.Avalonia/ContainerView.axaml b/Bitvault.Avalonia/ContainerView.axaml
index 9b18cfd..1121b2e 100644
--- a/Bitvault.Avalonia/ContainerView.axaml
+++ b/Bitvault.Avalonia/ContainerView.axaml
@@ -55,13 +55,13 @@
                         </Interaction.Behaviors>
                     </ContentControl>
                 </Border>
-                <Frame x:Name="Content" Grid.Row="1">
+                <ContentControl x:Name="Content" Grid.Row="1">
                     <Interaction.Behaviors>
                         <AttachedBehaviour>
                             <NavigateRegionAction Name="{Binding Named, StringFormat='{}{0}:Content'}" />
                         </AttachedBehaviour>
                     </Interaction.Behaviors>
-                </Frame>
+                </ContentControl>
             </Grid>
         </Border>
     </Grid>