Bugfixing

Author: iSapozhnik

Example/LoadingViewController/ViewController.swift

@@ -41,7 +41,7 @@ class ViewController: LoadingViewController {
     }
 
 	override func loadingViewStyle() -> LoadingViewStyle {
-		return .Stroke
+		return .Indicator
 	}
 }
 

LoadingViewController.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'LoadingViewController'
-  s.version          = '0.1.6'
+  s.version          = '0.1.7'
   s.summary          = 'LoadingViewController is a component for changing controller views: content -> loading -> content or content -> loading -> error.'
 
 # This description is used to generate tags and improve search results.

LoadingViewController/Classes/LoadingViewController.swift

@@ -230,11 +230,14 @@ public class LoadingViewController: UIViewController {
 		performTransitionFromView(fromView as? UIView, toView: toView! as! UIView, animated: animated! as! Bool, contentType: ContentType(rawValue: contentType! as! Int)!)
 	}
 
-	private func isContentViewAvailable(checkingView: UIView) -> Bool {
+	private func isContentViewAvailable(checkingView: UIView?) -> Bool {
 
 		var result = false
+		if checkingView == nil {
+			return result
+		}
 
-		let theView = checkingView
+		let theView = checkingView!
 		while let theViewUnw = theView.superview {
 			if theViewUnw == self.view { break }
 			if theViewUnw == self.contentView {
@@ -262,19 +265,21 @@ public class LoadingViewController: UIViewController {
 		}
 
 		let theFromView = fromView
+		let theFromViewInConentView = isContentViewAvailable(theFromView)
 		let fromViewIsContentView = (theFromView == self.contentView)
 
 		let theToView = toView
+		let theToViewInContentView = isContentViewAvailable(theToView)
 		let toViewIsContentView = (theToView == self.contentView)
 
 		if fromViewIsContentView && toViewIsContentView {
 			finish()
 			return
 		}
 
-		let contentViewAlpha = (toViewIsContentView || fromViewIsContentView) ? 1.0 : 0.0
+		let contentViewAlpha = (theToViewInContentView || toViewIsContentView) ? 1.0 : 0.0
 		let removesFromView = !fromViewIsContentView
-		let animatesToView = (!fromViewIsContentView || !toViewIsContentView)
+		let animatesToView = (!theFromViewInConentView || !fromViewIsContentView)
 		let animatesFromView = !fromViewIsContentView
 
 		func animations() {