Skip to content

Fix for rootVC issue #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for rootVC issue #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b938a99
fix for rootVC issue
zanderisrael Apr 3, 2022
d39ab63
Update EKWindow.swift
zanderisrael May 12, 2024
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
2 changes: 1 addition & 1 deletion Source/Infra/EKWindow.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class EKWindow: UIWindow {
init(with rootVC: UIViewController) {
if #available(iOS 13.0, *) {
// TODO: Patched to support SwiftUI out of the box but should require attendance
if let scene = UIApplication.shared.connectedScenes.filter({$0.activationState == .foregroundActive}).first as? UIWindowScene {
if let scene = UIApplication.shared.connectedScenes.first as? UIWindowScene {
super.init(windowScene: scene)
} else {
super.init(frame: UIScreen.main.bounds)
Expand Down
2 changes: 1 addition & 1 deletion Source/Infra/EKWindowProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ final class EKWindowProvider: EntryPresenterDelegate {
/** Boilerplate generic setup for entry-window and root-view-controller */
private func setupWindowAndRootVC() -> EKRootViewController {
let entryVC: EKRootViewController
if entryWindow == nil {
if entryWindow == nil || rootVC == nil {
entryVC = EKRootViewController(with: self)
entryWindow = EKWindow(with: entryVC)
mainRollbackWindow = UIApplication.shared.keyWindow
Expand Down