macOS does not use PopoverPresentationController

Fixes #18156
dotnet · Feb 18, 2024 · 68c930f · 68c930f
1 parent 7773f90
commit 68c930f
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/Controls/src/Core/Platform/AlertManager/AlertManager.iOS.cs b/src/Controls/src/Core/Platform/AlertManager/AlertManager.iOS.cs
@@ -177,11 +177,14 @@ void PresentActionSheet(Page sender, ActionSheetArguments arguments)
 
 			static void PresentPopUp(Page sender, Window virtualView, UIWindow platformView, UIAlertController alert, ActionSheetArguments arguments = null)
 			{
-				if (UIDevice.CurrentDevice.UserInterfaceIdiom == UIUserInterfaceIdiom.Pad && arguments != null)
+				if (UIDevice.CurrentDevice.UserInterfaceIdiom == UIUserInterfaceIdiom.Pad &&
+				    arguments is not null &&
+				    alert.PopoverPresentationController is not null &&
+				    platformView.RootViewController?.View is not null)
 				{
 					UIDevice.CurrentDevice.BeginGeneratingDeviceOrientationNotifications();
 					var observer = NSNotificationCenter.DefaultCenter.AddObserver(UIDevice.OrientationDidChangeNotification,
-						n => { alert.PopoverPresentationController.SourceRect = platformView.RootViewController.View.Bounds; });
+						n => alert.PopoverPresentationController.SourceRect = platformView.RootViewController.View.Bounds);
 
 					arguments.Result.Task.ContinueWith(t =>
 					{
@@ -214,7 +217,7 @@ static void PresentPopUp(Page sender, Window virtualView, UIWindow platformView,
 			static UIViewController GetTopUIViewController(UIWindow platformWindow)
 			{
 				var topUIViewController = platformWindow.RootViewController;
-				while (topUIViewController.PresentedViewController is not null)
+				while (topUIViewController?.PresentedViewController is not null)
 				{
 					topUIViewController = topUIViewController.PresentedViewController;
 				}