Skip to content

Commit 8d3496d

Browse files
committed
Fix versionCheckCoordinator being called too early, before the views are loaded, and crashing.
1 parent 87e3c64 commit 8d3496d

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

Riot/Modules/TabBar/TabBarCoordinator.swift

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -315,19 +315,6 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
315315

316316
viewControllers.append(homeViewController)
317317

318-
if let existingVersionCheckCoordinator = self.versionCheckCoordinator {
319-
self.remove(childCoordinator: existingVersionCheckCoordinator)
320-
}
321-
322-
if let masterTabBarController = self.masterTabBarController {
323-
324-
let versionCheckCoordinator = self.createVersionCheckCoordinator(withRootViewController: masterTabBarController, bannerPresentrer: homeViewController)
325-
versionCheckCoordinator.start()
326-
self.add(childCoordinator: versionCheckCoordinator)
327-
328-
self.versionCheckCoordinator = versionCheckCoordinator
329-
}
330-
331318
if RiotSettings.shared.homeScreenShowFavouritesTab {
332319
let favouritesViewController = self.createFavouritesViewController()
333320
viewControllers.append(favouritesViewController)
@@ -349,6 +336,16 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
349336
}
350337

351338
tabBarController.updateViewControllers(viewControllers)
339+
340+
if let existingVersionCheckCoordinator = self.versionCheckCoordinator {
341+
self.remove(childCoordinator: existingVersionCheckCoordinator)
342+
}
343+
344+
let versionCheckCoordinator = self.createVersionCheckCoordinator(withRootViewController: tabBarController, bannerPresentrer: homeViewController)
345+
versionCheckCoordinator.start()
346+
self.add(childCoordinator: versionCheckCoordinator)
347+
348+
self.versionCheckCoordinator = versionCheckCoordinator
352349
}
353350

354351
// MARK: Navigation

0 commit comments

Comments
 (0)