fixed mac "open with" timing bug

octopuscinema · Nov 9, 2022 · b9f8deb · b9f8deb
1 parent 0a466ea
commit b9f8deb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/UI/Common/Window/PlayerWindow.cs b/UI/Common/Window/PlayerWindow.cs
@@ -80,18 +80,20 @@ public void OnLoad()
             // Create the animate controls timer
             AnimateOutControlsTimer = new Timer(new TimerCallback(AnimateOutControls), null, TimeSpan.Zero, TimeSpan.FromSeconds(1.0));
 
-            // Handle "open with" after loading (Windows)
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && NativeWindow.PlayerApplication.OpenOnStart != null && NativeWindow.PlayerApplication.OpenOnStart.Length > 0)
-            {
-                DropFiles(NativeWindow.PlayerApplication.OpenOnStart);
-                NativeWindow.PlayerApplication.OpenOnStart = null;
-            }
-
             // Check for updates on startup
             if (NetworkInterface.GetIsNetworkAvailable())
                 NativeWindow.PlayerApplication.CheckForUpdatesAsync(this);
         }
 
+        public void OnReady()
+        {
+            if (NativeWindow.PlayerApplication.OpenOnStart != null && NativeWindow.PlayerApplication.OpenOnStart.Length > 0)
+            {
+                DropFiles(NativeWindow.PlayerApplication.OpenOnStart);
+                NativeWindow.PlayerApplication.OpenOnStart = null;
+            }
+        }
+
         private void OnThemeChanged()
         {
             if (RenderContext != null)
@@ -955,13 +957,6 @@ public void OnRenderInit(GPU.Render.IContext renderContext)
             RenderContext = renderContext;
             RenderContext.BackgroundColor = Theme.EmptyBackground;
             RenderContext.RedrawBackground = GPU.Render.RedrawBackground.Once;
-
-            // Handle open with after initisliation the renderer (macOS)
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && NativeWindow.PlayerApplication.OpenOnStart != null && NativeWindow.PlayerApplication.OpenOnStart.Length > 0 )
-            {
-                DropFiles(NativeWindow.PlayerApplication.OpenOnStart);
-                NativeWindow.PlayerApplication.OpenOnStart = null;
-            }
         }
 
         public void OnRenderFrame(double timeInterval)

diff --git a/UI/macOS/AppDelegate.cs b/UI/macOS/AppDelegate.cs
@@ -122,6 +122,7 @@ public override void DidFinishLaunching(NSNotification notification)
             });
 
             FinishedLaunching = true;
+            PlayerWindowController.PlayerWindow.PlayerWindow.OnReady();
         }
 
         public override bool ApplicationShouldTerminateAfterLastWindowClosed(NSApplication sender)