Fixed retaining issues while waiting for video URL

Author: mwaterfall

Pod/Classes/MWPhoto.m

@@ -122,10 +122,13 @@ - (void)getVideoURL:(void (^)(NSURL *url))completion {
         [self cancelVideoRequest]; // Cancel any existing
         PHVideoRequestOptions *options = [PHVideoRequestOptions new];
         options.networkAccessAllowed = YES;
+        typeof(self) __weak weakSelf = self;
         _assetVideoRequestID = [[PHImageManager defaultManager] requestAVAssetForVideo:_asset options:options resultHandler:^(AVAsset *asset, AVAudioMix *audioMix, NSDictionary *info) {
 
             // dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 3 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{ // Testing
-            _assetVideoRequestID = PHInvalidImageRequestID;
+            typeof(self) strongSelf = weakSelf;
+            if (!strongSelf) return;
+            strongSelf->_assetVideoRequestID = PHInvalidImageRequestID;
             if ([asset isKindOfClass:[AVURLAsset class]]) {
                 completion(((AVURLAsset *)asset).URL);
             } else {

Pod/Classes/MWPhotoBrowser.m

@@ -1202,7 +1202,9 @@ - (void)playVideoAtIndex:(NSUInteger)index {
         [photo getVideoURL:^(NSURL *url) {
             dispatch_async(dispatch_get_main_queue(), ^{
                 // If the video is not playing anymore then bail
-                if (_currentVideoIndex != index || !_viewIsActive) {
+                typeof(self) strongSelf = weakSelf;
+                if (!strongSelf) return;
+                if (strongSelf->_currentVideoIndex != index || !strongSelf->_viewIsActive) {
                     return;
                 }
                 if (url) {