Skip to content
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

Jump to bottom

[TIMOB-18175] Check if ViewController dismissal #6468

Merged
merged 1 commit into from
Dec 10, 2014
Merged

[TIMOB-18175] Check if ViewController dismissal #6468

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions iphone/Classes/TiRootViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,6 +854,11 @@ -(void)showControllerModal:(UIViewController*)theController animated:(BOOL)anima
{
BOOL trulyAnimated = animated;
UIViewController* topVC = [self topPresentedController];

if ([topVC isBeingDismissed]) {
topVC = [topVC presentingViewController];
}

if ([topVC isKindOfClass:[TiErrorController class]]) {
DebugLog(@"[ERROR] ErrorController is up. ABORTING showing of modal controller");
return;
Expand Down