Merge branch 'develop' into 'master'

Fix bug

Fix bug

See merge request !3
This commit is contained in:
Giuseppe Nucifora 2016-02-09 13:28:53 +00:00
commit dfb0c95c44
3 changed files with 8 additions and 3 deletions

View File

@ -15,6 +15,7 @@
@property (nonatomic) BOOL didSetupConstraints; @property (nonatomic) BOOL didSetupConstraints;
@property (nonatomic, strong) UIButton *button; @property (nonatomic, strong) UIButton *button;
@property (nonatomic, strong) UIImageView *imageView; @property (nonatomic, strong) UIImageView *imageView;
@property (nonatomic, strong) PNImagePickerViewController *imagePickerController;
@end @end
@ -66,9 +67,11 @@
- (void) showPicker { - (void) showPicker {
PNImagePickerViewController *imagePicker = [[PNImagePickerViewController alloc] init]; if (!_imagePickerController) {
imagePicker.delegate = self; _imagePickerController = [[PNImagePickerViewController alloc] init];
[imagePicker showImagePickerInController:self animated:YES]; _imagePickerController.delegate = self;
}
[_imagePickerController showImagePickerInController:self animated:YES];
} }

View File

@ -71,6 +71,7 @@
if (photoImage) { if (photoImage) {
[_photoImageView setImage:photoImage]; [_photoImageView setImage:photoImage];
[_loadingSpinner stopAnimating]; [_loadingSpinner stopAnimating];
[_loadingSpinner setAlpha:0];
} }
} }

View File

@ -488,6 +488,7 @@
} }
}]; }];
} }
_isVisible = NO;
} }
} }