Added condition in WindowStateManager for selecting proper scene used…

… with role Application (#23945)
dotnet · Aug 6, 2024 · 6bfd7e1 · 6bfd7e1
1 parent cd7107e
commit 6bfd7e1
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Essentials/src/Platform/WindowStateManager.ios.cs b/src/Essentials/src/Platform/WindowStateManager.ios.cs
@@ -140,7 +140,8 @@ public void Init(Func<UIViewController?>? getCurrentUIViewController) =>
  try
  {
  using var scenes = UIApplication.SharedApplication.ConnectedScenes;
- var windowScene = scenes.ToArray<UIWindowScene>().FirstOrDefault();
+ var windowScene = scenes.ToArray().OfType<UIWindowScene>().FirstOrDefault(scene => 
+ scene.Session.Role == UIWindowSceneSessionRole.Application);
  return windowScene?.Windows.FirstOrDefault();
  }
  catch (InvalidCastException)
@@ -163,7 +164,8 @@ public void Init(Func<UIViewController?>? getCurrentUIViewController) =>
  try
  {
  using var scenes = UIApplication.SharedApplication.ConnectedScenes;
- var windowScene = scenes.ToArray<UIWindowScene>().FirstOrDefault();
+ var windowScene = scenes.ToArray().OfType<UIWindowScene>().FirstOrDefault(scene => 
+ scene.Session.Role == UIWindowSceneSessionRole.Application);
  return windowScene?.Windows;
  }
  catch (InvalidCastException)