Remove some hosts references and fix close button

Author: noraa-junker

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/Assets/Hosts/AppList.scale-100.png

@@ -62,13 +62,19 @@ public static implicit operator ShortcutTemplateDataObject(ShortcutEntry shortcu
 
             async void AnimateTextBlock(TextBlock animatedTextBlock, string text, int delay = 500)
             {
-                int index = 0;
+                try
+                {
+                    int index = 0;
 
-                while (true)
+                    while (!ShortcutView.AnimationCancellationTokenSource.Token.IsCancellationRequested)
+                    {
+                        animatedTextBlock.Text = text[index].ToString();
+                        index = (index + 1) % text.Length;
+                        await Task.Delay(delay);
+                    }
+                }
+                catch
                 {
-                    animatedTextBlock.Text = text[index].ToString();
-                    index = (index + 1) % text.Length;
-                    await Task.Delay(delay);
                 }
             }
 
@@ -254,7 +260,7 @@ void AddNewTextToStackPanel(string text)
                 async void AnimateStackPanels(StackPanel[] panels, int delay = 2000)
                 {
                     int index = 0;
-                    while (true)
+                    while (!ShortcutView.AnimationCancellationTokenSource.Token.IsCancellationRequested)
                     {
                         foreach (StackPanel panel in panels)
                         {

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/Assets/Hosts/AppList.scale-125.png

@@ -8,6 +8,7 @@
 using System.Threading;
 using ManagedCommon;
 using Microsoft.UI.Dispatching;
+using Microsoft.UI.Xaml;
 using Microsoft.Windows.AppLifecycle;
 using ShortcutGuide.Helpers;
 
@@ -25,6 +26,12 @@ public sealed class Program
         [STAThread]
         public static void Main()
         {
+            if (PowerToys.GPOWrapper.GPOWrapper.GetConfiguredShortcutGuideEnabledValue() == PowerToys.GPOWrapper.GpoRuleConfigured.Disabled)
+            {
+                Logger.LogWarning("Tried to start with a GPO policy setting the utility to always be disabled. Please contact your systems administrator.");
+                return;
+            }
+
             if (!Directory.Exists(ManifestInterpreter.GetPathOfIntepretations()))
             {
                 Directory.CreateDirectory(ManifestInterpreter.GetPathOfIntepretations());
@@ -43,17 +50,11 @@ public static void Main()
             Logger.InitializeLogger("\\ShortcutGuide\\Logs");
             WinRT.ComWrappersSupport.InitializeComWrappers();
 
-            if (PowerToys.GPOWrapper.GPOWrapper.GetConfiguredShortcutGuideEnabledValue() == PowerToys.GPOWrapper.GpoRuleConfigured.Disabled)
-            {
-                Logger.LogWarning("Tried to start with a GPO policy setting the utility to always be disabled. Please contact your systems administrator.");
-                return;
-            }
-
             var instanceKey = AppInstance.FindOrRegisterForKey("PowerToys_ShortcutGuide_Instance");
 
             if (instanceKey.IsCurrent)
             {
-                Microsoft.UI.Xaml.Application.Start((p) =>
+                Application.Start((p) =>
                 {
                     var context = new DispatcherQueueSynchronizationContext(DispatcherQueue.GetForCurrentThread());
                     SynchronizationContext.SetSynchronizationContext(context);
@@ -65,6 +66,9 @@ public static void Main()
                 Logger.LogWarning("Another instance of ShortcutGuide is running. Exiting ShortcutGuide");
             }
 
+            // Something prevents the process from exiting, so we need to kill it manually.
+            Process.GetCurrentProcess().Kill();
+
             return;
         }
     }