summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Freeman (saurik) <saurik@saurik.com>2011-03-14 02:01:21 -0700
committerJay Freeman (saurik) <saurik@saurik.com>2011-03-14 05:09:10 -0700
commitceed86247fa68805ac51e5fa12b7155126c3e2ca (patch)
tree3178ed2750e91df5bb6033b7f0aecf05f471c877
parentace9d463aa1b8e68f84e83aca0dbd288a996a728 (diff)
Allow window.close() to close unselected controllers.
-rw-r--r--CyteKit/WebViewController.mm2
-rw-r--r--MobileCydia.mm7
2 files changed, 8 insertions, 1 deletions
diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm
index 2d9cfe1..4b2116f 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 d6bea29..92f5a0a 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];