Only enable prelaunch when AlwaysOpenNewWindow is set to false

Xen0byte · Dec 18, 2023 · b778721 · b778721
1 parent 99c94ed
commit b778721
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/Notepads/App.xaml.cs b/src/Notepads/App.xaml.cs
@@ -167,6 +167,19 @@ private async Task ActivateAsync(IActivatedEventArgs e)
                 throw;
             }
 
+            try
+            {
+                if (Windows.Foundation.Metadata.ApiInformation.IsMethodPresent("Windows.ApplicationModel.Core.CoreApplication", "EnablePrelaunch"))
+                {
+                    // Only enable prelaunch when AlwaysOpenNewWindow is set to false
+                    CoreApplication.EnablePrelaunch(!AppSettingsService.AlwaysOpenNewWindow);
+                }
+            }
+            catch (Exception)
+            {
+                // Best efforts
+            }
+
             if (rootFrameCreated)
             {
                 ExtendViewIntoTitleBar();

diff --git a/src/Notepads/Services/ActivationService.cs b/src/Notepads/Services/ActivationService.cs
@@ -53,12 +53,6 @@ private static void LaunchActivated(Frame rootFrame, LaunchActivatedEventArgs la
         {
             LoggingService.LogInfo($"[{nameof(ActivationService)}] [LaunchActivated] Kind: {launchActivatedEventArgs.Kind}");
 
-            if (launchActivatedEventArgs.PrelaunchActivated == false)
-            {
-                // On Windows 10 version 1607 or later, this code signals that this app wants to participate in prelaunch
-                Windows.ApplicationModel.Core.CoreApplication.EnablePrelaunch(true);
-            }
-
             if (rootFrame.Content == null)
             {
                 rootFrame.Navigate(typeof(NotepadsMainPage), launchActivatedEventArgs.Arguments);