Merge pull request #4 from jgonfer/1.1.1

1.1.1 -> master
jgonfer · Feb 17, 2017 · fb13a10 · fb13a10
2 parents d65f63f + 2c538dd
commit fb13a10
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/touch 3d/touch 3d/AnimalsViewController.swift b/touch 3d/touch 3d/AnimalsViewController.swift
@@ -27,7 +27,9 @@ class AnimalsViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        setupView()
+        if animals == nil {
+            setupView()
+        }
 
         if traitCollection.forceTouchCapability == .available {
             registerForPreviewing(with: self, sourceView: view)
@@ -38,6 +40,7 @@ class AnimalsViewController: UIViewController {
         super.viewWillAppear(animated)
 
         guard let index = selectedIndex else {
+            tableView.reloadData()
             return
         }
         updateAnimalState(atIndex: index)
@@ -63,10 +66,10 @@ class AnimalsViewController: UIViewController {
             selectedIndex = IndexPath(row: 1, section: 0)
             performSegue(withIdentifier: segueIdentifier, sender: nil)
         case .OpenRandomAnimal:
-            guard let animals = self.animals else {
-                return false
+            if animals == nil {
+                setupView()
             }
-            let randomNumber = Int(arc4random_uniform(UInt32(animals.count)))
+            let randomNumber = Int(arc4random_uniform(UInt32(animals!.count)))
             selectedIndex = IndexPath(row: randomNumber, section: 0)
             performSegue(withIdentifier: segueIdentifier, sender: nil)
         default: