Skip to content

Commit

Permalink
Fixed in presenting waiting VC
Browse files Browse the repository at this point in the history
  • Loading branch information
AdamSliwakowski committed Apr 23, 2016
1 parent 9ba83e9 commit a5d5ad1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Succotash/Succotash/Storyboard/Questions.storyboard
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="2bM-zi-eni">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
Expand Down
10 changes: 4 additions & 6 deletions Succotash/Succotash/ViewController/QuestionsViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,8 @@ extension QuestionsViewController {
extension QuestionsViewController {
private func presentWaitingViewController() {
let waitingVC = storyboard?.instantiateViewControllerWithIdentifier("WaitingViewController") as! WaitingViewController
presentViewController(waitingVC, animated: true) { [unowned self] in
self.configureWaitingVC(waitingVC)
}
configureWaitingVC(waitingVC)
presentViewController(waitingVC, animated: true, completion: nil)
}

private func configureWaitingVC(vc: WaitingViewController) {
Expand All @@ -130,9 +129,8 @@ extension QuestionsViewController {
timer?.invalidate()
timer = nil
let waitingVC = storyboard?.instantiateViewControllerWithIdentifier("WaitingViewController") as! WaitingViewController
presentViewController(waitingVC, animated: true) {
waitingVC.configureWithoutTimer()
}
waitingVC.configureWithoutTimer()
presentViewController(waitingVC, animated: true, completion: nil)
}
}

Expand Down

0 comments on commit a5d5ad1

Please sign in to comment.