Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions packages/core/application/application.ios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,8 @@ class SceneDelegate extends UIResponder implements UIWindowSceneDelegate {
return;
}

const isFirstScene = !Application.ios.getPrimaryScene() && !Application.hasLaunched();

this._scene = scene;

// Create window for this scene
Expand Down Expand Up @@ -221,7 +223,7 @@ class SceneDelegate extends UIResponder implements UIWindowSceneDelegate {
}

// If this is the first scene, trigger app startup
if (!Application.ios.getPrimaryScene()) {
if (isFirstScene) {
Application.ios._notifySceneAppStarted();
}
}
Expand Down Expand Up @@ -905,8 +907,11 @@ export class iOSApplication extends ApplicationCommon {
setiOSWindow(window);
}

// Set up the window content for the primary scene
this.setWindowContent();
// During initial scene startup we must wait for launch to be notified first.
// Some frameworks provide root content from launch handlers.
if (this.hasLaunched()) {
this.setWindowContent();
}
}
}

Expand Down
Loading