Allow window.close() to close unselected controllers.

diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm
index 2d9cfe18a8dd684c21420ad28a80d44bab707b8d..4b2116f3f01da29709a6b1462a280d77c21c42da 100644 (file)
--- a/CyteKit/WebViewController.mm
+++ b/CyteKit/WebViewController.mm
@@ -581,7 +581,7 @@ float CYScrollViewDecelerationRateNormal;
 // }}}
 
 - (void) close {
 // }}}
 
 - (void) close {

-    [[self navigationController] dismissModalViewControllerAnimated:YES];
+    [[[self navigationController] parentViewController] dismissModalViewControllerAnimated:YES];

 }
 
 - (void) alertView:(UIAlertView *)alert clickedButtonAtIndex:(NSInteger)button {
 }
 
 - (void) alertView:(UIAlertView *)alert clickedButtonAtIndex:(NSInteger)button {

diff --git a/MobileCydia.mm b/MobileCydia.mm
index d6bea29f743f895940fa8946ceb266b6a1e4bd76..92f5a0aec2a0d64cbd18fab419608be636def17b 100644 (file)
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -6763,6 +6763,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     return items;
 }
 
     return items;
 }
 

+- (void) dismissModalViewControllerAnimated:(BOOL)animated {
+    if ([self modalViewController] == nil && [self unselectedViewController] != nil)
+        [self setUnselectedViewController:nil];
+    else
+        [super dismissModalViewControllerAnimated:YES];
+}
+

 - (void) unloadData {
     [super unloadData];
 
 - (void) unloadData {
     [super unloadData];