Merge pull request #2942 from mstepanov/timob-9492

[TIMOB-9492] iOS: fix loss of JS reference to camera overlay
tidev · Sep 18, 2012 · 3de1443 · 3de1443
2 parents 5486a27 + ef8e9bd
commit 3de1443
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/iphone/Classes/MediaModule.m b/iphone/Classes/MediaModule.m
@@ -98,6 +98,7 @@ -(void)destroyPickerCallbacks
 -(void)destroyPicker
 {
 	RELEASE_TO_NIL(popover);
+	[self forgetProxy:cameraView];
     RELEASE_TO_NIL(cameraView);
 	RELEASE_TO_NIL(editor);
 	RELEASE_TO_NIL(editorSuccessCallback);
@@ -306,6 +307,7 @@ -(void)closeModalPicker:(UIViewController*)picker_
 	}
     if (cameraView != nil) {
         [cameraView windowDidClose];
+		[self forgetProxy:cameraView];
         RELEASE_TO_NIL(cameraView);
     }
 }
@@ -894,7 +896,12 @@ -(BOOL)isCameraSupported;
 -(void)showCamera:(id)args
 {
 	ENSURE_SINGLE_ARG_OR_NIL(args,NSDictionary);
-	ENSURE_UI_THREAD(showCamera,args);
+	if (![NSThread isMainThread]) {
+		[self rememberProxy:[args objectForKey:@"overlay"]];
+		TiThreadPerformOnMainThread(^{[self showCamera:args];},NO);
+		return;
+	}
+
 	[self showPicker:args isCamera:YES];
 }
 
@@ -1107,6 +1114,7 @@ -(void)hideCamera:(id)args
 		}
         if (cameraView != nil) {
             [cameraView windowDidClose];
+			[self forgetProxy:cameraView];
             RELEASE_TO_NIL(cameraView);
         }
 		[self destroyPicker];