Merge branch 'yepher-develop' into develop

Cocoanetics · Dec 2, 2014 · b215d72 · b215d72
2 parents dcb28c6 + e5ccb4a
commit b215d72
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Core/Source/DTZipArchive/DTZipArchiveGZip.m b/Core/Source/DTZipArchive/DTZipArchiveGZip.m
@@ -244,8 +244,11 @@ - (NSData *)uncompressZipArchiveNode:(DTZipArchiveNode *)node withError:(NSError
 {
 	if (![self.nodes containsObject:node])
 	{
-		NSDictionary *userInfo = @{NSLocalizedDescriptionKey : @"Invalid node specified, cannot uncompress GZip file."};
-		*error = [[NSError alloc] initWithDomain:DTZipArchiveErrorDomain code:7 userInfo:userInfo];
+		if (error)
+		{
+			NSDictionary *userInfo = @{NSLocalizedDescriptionKey : @"Invalid node specified, cannot uncompress GZip file."};
+			*error = [[NSError alloc] initWithDomain:DTZipArchiveErrorDomain code:7 userInfo:userInfo];
+		}
 
 		return nil;
 	}

diff --git a/Core/Source/iOS/DTProgressHUD/DTProgressHUD.m b/Core/Source/iOS/DTProgressHUD/DTProgressHUD.m
@@ -276,7 +276,6 @@ - (void)_showAnimation
 			[collision addBoundaryWithIdentifier:@"barrier1" fromPoint:leftPoint toPoint:rightPoint];
 
 			// calculate points for barrier
-			height = self.center.y + PROGRESS_HEIGHT / 2;
 			leftPoint = CGPointMake(0, 0);
 			rightPoint = CGPointMake(self.center.x - PROGRESS_WIDTH / 2 - offset + BARRIER_LENGTH, 0);
 			[collision addBoundaryWithIdentifier:@"barrier2" fromPoint:leftPoint toPoint:rightPoint];

diff --git a/Core/Source/iOS/DTSidePanel/DTSidePanelController.m b/Core/Source/iOS/DTSidePanel/DTSidePanelController.m
@@ -737,7 +737,7 @@ - (void)handlePan:(UIPanGestureRecognizer *)gesture
 
 - (void)presentPanel:(DTSidePanelControllerPanel)panel animated:(BOOL)animated
 {
-	CGPoint targetPosition;
+	CGPoint targetPosition = [self _centerPanelPositionWithLeftPanelOpen];
 
 	_panelToPresentAfterLayout = panel;