Skip to content

fixed a bug modal viewController was not deallocated when to call dis… #2843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yogevbd merged 3 commits into from
May 2, 2018
Merged

fixed a bug modal viewController was not deallocated when to call dis… #2843

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee0ef32
fixed a bug modal viewController was not deallocated when to call dis…
masarusanjp Mar 10, 2018
b3699c7
Merge branch 'master' into fix-ios-dismiss-all-modals-api
masarusanjp Mar 26, 2018
636e409
Merge branch 'master' into fix-ios-dismiss-all-modals-api
yogevbd May 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions ios/RCCManagerModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,15 +171,20 @@ -(void)dismissAllModalPresenters:(NSMutableArray*)allPresentedViewControllers re

dispatch_semaphore_wait(dismiss_sema, DISPATCH_TIME_FOREVER);
}
else if (counter == allPresentedViewControllers.count && allPresentedViewControllers.count > 0)
{
[allPresentedViewControllers removeAllObjects];

if (resolve != nil) {
dispatch_async(dispatch_get_main_queue(), ^
{
resolve(nil);
});
else {
if (rootViewController != viewController) {
[[RCCManager sharedIntance] unregisterController:viewController];
}
if (counter == allPresentedViewControllers.count && allPresentedViewControllers.count > 0)
{
[allPresentedViewControllers removeAllObjects];

if (resolve != nil) {
dispatch_async(dispatch_get_main_queue(), ^
{
resolve(nil);
});
}
}
}
}
Expand Down