From f8934f92197ac835dfbfcabd0b8f5abf00a6e31d Mon Sep 17 00:00:00 2001 From: Nathan Racklyeft Date: Mon, 4 Jul 2016 22:11:21 -0700 Subject: [PATCH] Fixing the transition state to Carb and Bolus entry view controllers Broken in #55 / 25b0c1c --- Loop/View Controllers/BolusViewController.swift | 4 ---- Loop/View Controllers/StatusTableViewController.swift | 6 +++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Loop/View Controllers/BolusViewController.swift b/Loop/View Controllers/BolusViewController.swift index 6e5176d2a7..33807fdf33 100644 --- a/Loop/View Controllers/BolusViewController.swift +++ b/Loop/View Controllers/BolusViewController.swift @@ -69,10 +69,6 @@ class BolusViewController: UITableViewController, IdentifiableClass, UITextField } } - override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) { - super.prepareForSegue(segue, sender: sender) - } - private lazy var decimalFormatter: NSNumberFormatter = { let numberFormatter = NSNumberFormatter() diff --git a/Loop/View Controllers/StatusTableViewController.swift b/Loop/View Controllers/StatusTableViewController.swift index 67c45d2679..1ed34c7ea1 100644 --- a/Loop/View Controllers/StatusTableViewController.swift +++ b/Loop/View Controllers/StatusTableViewController.swift @@ -624,7 +624,11 @@ class StatusTableViewController: UITableViewController, UIGestureRecognizerDeleg override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) { super.prepareForSegue(segue, sender: sender) - switch segue.destinationViewController { + guard let navVC = segue.destinationViewController as? UINavigationController else { + return + } + + switch navVC.topViewController { case let vc as CarbEntryTableViewController: vc.carbStore = dataManager.carbStore vc.hidesBottomBarWhenPushed = true