Fixed case where drawer side controller is nil. Fixes #1

mutualmobile · May 9, 2013 · d5dc89d · d5dc89d
1 parent b9edd1a
commit d5dc89d
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/MMDrawerController/MMDrawerController.m b/MMDrawerController/MMDrawerController.m
@@ -628,12 +628,14 @@ -(void)panGesture:(UIPanGestureRecognizer *)panGesture{
  UIViewController * visibleSideDrawerViewController;
  MMDrawerSide visibleSide = MMDrawerSideNone;
  CGFloat percentVisible = 0.0;
- if(xOffset > 0){
+ if((xOffset > 0) &&
+ (self.leftDrawerViewController != nil)){
  visibleSideDrawerViewController = self.leftDrawerViewController;
  visibleSide = MMDrawerSideLeft;
  percentVisible = xOffset/self.maximumLeftDrawerWidth;
  }
- else if(xOffset < 0){
+ else if((xOffset < 0) &&
+ (self.rightDrawerViewController != nil)){
  visibleSideDrawerViewController = self.rightDrawerViewController;
  visibleSide = MMDrawerSideRight;
  percentVisible = ABS(xOffset)/self.maximumRightDrawerWidth;
@@ -648,9 +650,11 @@ -(void)panGesture:(UIPanGestureRecognizer *)panGesture{
  [self setOpenSide:MMDrawerSideNone];
  }
 
- [self updateDrawerVisualStateForDrawerSide:visibleSide percentVisible:percentVisible];
-
- [self.centerContainerView setCenter:CGPointMake(CGRectGetMidX(newFrame), CGRectGetMidY(newFrame))];
+ if (visibleSide != MMDrawerSideNone) {
+ [self updateDrawerVisualStateForDrawerSide:visibleSide percentVisible:percentVisible];
+
+ [self.centerContainerView setCenter:CGPointMake(CGRectGetMidX(newFrame), CGRectGetMidY(newFrame))];
+ }
  break;
  }
  case UIGestureRecognizerStateCancelled:
@@ -700,6 +704,9 @@ -(void)finishAnimationForPanGestureWithXVelocity:(CGFloat)xVelocity completion:(
  [self openDrawerSide:MMDrawerSideRight animated:YES completion:completion];
  }
  }
+ else{
+ [self closeDrawerAnimated:YES completion:completion];
+ }
 }
 
 -(void)updateDrawerVisualStateForDrawerSide:(MMDrawerSide)drawerSide percentVisible:(CGFloat)percentVisible{