fixed merge conflicts round 2

CosmicMind · Apr 27, 2018 · d31c58e · d31c58e
1 parent 515fc80
commit d31c58e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/Sources/MotionContext.swift b/Sources/MotionContext.swift
@@ -272,13 +272,15 @@ public extension MotionContext {
         } else {
           snapshot = view.snapshotView() ?? UIView()
         }
+
       #endif
     }
 
     #if os(tvOS)
       if let imageView = view as? UIImageView, imageView.adjustsImageWhenAncestorFocused {
         snapshot.frame = imageView.focusedFrameGuide.layoutFrame
       }
+
     #endif
 
     view.layer.cornerRadius = oldCornerRadius

diff --git a/Sources/Transition/MotionTransition+Start.swift b/Sources/Transition/MotionTransition+Start.swift
@@ -238,18 +238,18 @@ fileprivate extension MotionTransition {
   func processAnimation() {
     #if os(tvOS)
       animate()
-    
+
     #else
-    if isNavigationController {
-      // When animating within navigationController, we have to dispatch later into the main queue.
-      // otherwise snapshots will be pure white. Possibly a bug with UIKit
-      Motion.async { [weak self] in
-        self?.animate()
+      if isNavigationController {
+        // When animating within navigationController, we have to dispatch later into the main queue.
+        // otherwise snapshots will be pure white. Possibly a bug with UIKit
+        Motion.async { [weak self] in
+          self?.animate()
+        }
+
+      } else {
+        animate()
       }
-
-    } else {
-      animate()
-    }
 
     #endif
   }