Merge pull request #576 from LuckyDucko/patch-1

Update PopupPlatformMacOS.cs
rotorgames · Sep 3, 2020 · a1a483d · a1a483d
2 parents 466ec52 + 01a3a89
commit a1a483d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Rg.Plugins.Popup/Platforms/Mac/Impl/PopupPlatformMacOS.cs b/Rg.Plugins.Popup/Platforms/Mac/Impl/PopupPlatformMacOS.cs
@@ -37,7 +37,8 @@ public Task AddAsync(PopupPage page)
 
             var renderer = page.GetOrCreateRenderer();
 
-            NSApplication.SharedApplication.MainWindow.ContentView.AddSubview(renderer.NativeView);
+            var forcedMainWindow = NSApplication.SharedApplication.MainWindow ?? Application.Current.MainPage.GetOrCreateRenderer().NativeView.Window;
+            forcedMainWindow.ContentView.AddSubview(renderer.NativeView);
             return Task.CompletedTask;
         }