Merge branch 'develop' into 'master'

Fix bug

Fix bug

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

No files matched your search

@@ -15,6 +15,7 @@
@property (nonatomic) BOOL didSetupConstraints;
@property (nonatomic, strong) UIButton *button;
@property (nonatomic, strong) UIImageView *imageView;
@property (nonatomic, strong) PNImagePickerViewController *imagePickerController;
@end
@@ -66,9 +67,11 @@
- (void) showPicker {
PNImagePickerViewController *imagePicker = [[PNImagePickerViewController alloc] init];
imagePicker.delegate = self;
[imagePicker showImagePickerInController:self animated:YES];
if (!_imagePickerController) {
_imagePickerController = [[PNImagePickerViewController alloc] init];
_imagePickerController.delegate = self;
}
[_imagePickerController showImagePickerInController:self animated:YES];
}
+1
View File
@@ -71,6 +71,7 @@
if (photoImage) {
[_photoImageView setImage:photoImage];
[_loadingSpinner stopAnimating];
[_loadingSpinner setAlpha:0];
}
}
@@ -488,6 +488,7 @@
}
}];
}
_isVisible = NO;
}
}