FIX: reverting _originalFrame back to correct value

u10int · Mar 29, 2014 · 3385be3 · 3385be3
1 parent 1c82f0e
commit 3385be3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/URBMediaFocusViewController.m b/URBMediaFocusViewController.m
@@ -251,7 +251,7 @@ - (void)showImage:(UIImage *)image fromRect:(CGRect)fromRect {
 
 	// set initial frame of image view to match that of the presenting image
 	self.imageView.frame = [self.view convertRect:fromRect fromView:nil];
-	_originalFrame = fromRect;
+	_originalFrame = targetRect;
 
 	// rotate imageView based on current device orientation
 	[self reposition];
@@ -765,7 +765,7 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecogni
 	BOOL shouldRecognize = transformScale > _minScale;
 
 	// make sure tap and double tap gestures aren't recognized simultaneously
-	shouldRecognize = !([gestureRecognizer isKindOfClass:[UITapGestureRecognizer class]] && [otherGestureRecognizer isKindOfClass:[UITapGestureRecognizer class]]);
+	shouldRecognize = shouldRecognize && !([gestureRecognizer isKindOfClass:[UITapGestureRecognizer class]] && [otherGestureRecognizer isKindOfClass:[UITapGestureRecognizer class]]);
 
 	return shouldRecognize;
 }