From ceed86247fa68805ac51e5fa12b7155126c3e2ca Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Mon, 14 Mar 2011 02:01:21 -0700 Subject: [PATCH] Allow window.close() to close unselected controllers. --- CyteKit/WebViewController.mm | 2 +- MobileCydia.mm | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm index 2d9cfe18..4b2116f3 100644 --- a/CyteKit/WebViewController.mm +++ b/CyteKit/WebViewController.mm @@ -581,7 +581,7 @@ float CYScrollViewDecelerationRateNormal; // }}} - (void) close { - [[self navigationController] dismissModalViewControllerAnimated:YES]; + [[[self navigationController] parentViewController] dismissModalViewControllerAnimated:YES]; } - (void) alertView:(UIAlertView *)alert clickedButtonAtIndex:(NSInteger)button { diff --git a/MobileCydia.mm b/MobileCydia.mm index d6bea29f..92f5a0ae 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -6763,6 +6763,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { return items; } +- (void) dismissModalViewControllerAnimated:(BOOL)animated { + if ([self modalViewController] == nil && [self unselectedViewController] != nil) + [self setUnselectedViewController:nil]; + else + [super dismissModalViewControllerAnimated:YES]; +} + - (void) unloadData { [super unloadData]; -- 2.50.0