Fixed #105 - App crashes in the background with `The calling thread m…

…ust be STA`
ModernFlyouts-Community · Oct 15, 2020 · 1063dd4 · 1063dd4
1 parent 085de8d
commit 1063dd4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/ModernFlyouts/FlyoutHandler.cs b/ModernFlyouts/FlyoutHandler.cs
@@ -314,20 +314,23 @@ public static void SafelyExitApplication()
 
         public static void ShowSettingsWindow()
         {
-            if (Instance.SettingsWindow == null)
+            App.Current.Dispatcher.Invoke(() =>
             {
-                Instance.SettingsWindow = new SettingsWindow();
-                WindowPlacement.SetPlacement(new WindowInteropHelper(Instance.SettingsWindow).EnsureHandle(), AppDataHelper.SettingsWindowPlacement);
-
-                void handler(object sender, CancelEventArgs e)
+                if (Instance.SettingsWindow == null)
                 {
-                    Instance.SettingsWindow.Closing -= handler;
-                    AppDataHelper.SettingsWindowPlacement = WindowPlacement.GetPlacement(new WindowInteropHelper(Instance.SettingsWindow).Handle);
-                    Instance.SettingsWindow = null;
+                    Instance.SettingsWindow = new SettingsWindow();
+                    WindowPlacement.SetPlacement(new WindowInteropHelper(Instance.SettingsWindow).EnsureHandle(), AppDataHelper.SettingsWindowPlacement);
+
+                    void handler(object sender, CancelEventArgs e)
+                    {
+                        Instance.SettingsWindow.Closing -= handler;
+                        AppDataHelper.SettingsWindowPlacement = WindowPlacement.GetPlacement(new WindowInteropHelper(Instance.SettingsWindow).Handle);
+                        Instance.SettingsWindow = null;
+                    }
+                    Instance.SettingsWindow.Closing += handler;
                 }
-                Instance.SettingsWindow.Closing += handler;
-            }
-            Instance.SettingsWindow.Show();
+                Instance.SettingsWindow.Show();
+            });
         }
 
         public event PropertyChangedEventHandler PropertyChanged;

diff --git a/ModernFlyouts/JumpListHelper.cs b/ModernFlyouts/JumpListHelper.cs
@@ -22,7 +22,8 @@ public static void CreateJumpList()
                 Title = Properties.Strings.SettingsItem,
                 Description = Properties.Strings.SettingsItemDescription,
                 ApplicationPath = AppPath,
-                Arguments = arg_settings
+                Arguments = arg_settings,
+                IconResourceIndex = -1
             };
             jumpList.JumpItems.Add(settingsTask);
 
@@ -31,7 +32,8 @@ public static void CreateJumpList()
                 Title = Properties.Strings.RestoreDefaultItem,
                 Description = Properties.Strings.RestoreDefaultItemDescription,
                 ApplicationPath = AppPath,
-                Arguments = arg_restore
+                Arguments = arg_restore,
+                IconResourceIndex = -1,
             };
             jumpList.JumpItems.Add(restoreTask);
 
@@ -40,7 +42,8 @@ public static void CreateJumpList()
                 Title = Properties.Strings.ExitItem,
                 Description = Properties.Strings.ExitItemDescription,
                 ApplicationPath = AppPath,
-                Arguments = arg_exit
+                Arguments = arg_exit,
+                IconResourceIndex = -1
             };
             jumpList.JumpItems.Add(exitTask);