Don't hold the Removing Essentials dialog over ProgressController.

diff --git a/CyteKit/WebViewController.h b/CyteKit/WebViewController.h
index c2e64d53cf48c0fe29a7fc8fae3224359c11c77a..9b9ba9406d9fe3c6479ee2ced7ea90a4917014bf 100644 (file)
--- a/CyteKit/WebViewController.h
+++ b/CyteKit/WebViewController.h
@@ -109,9 +109,6 @@
 - (void) loadRequest:(NSURLRequest *)request;
 - (bool) isLoading;
 
 - (void) loadRequest:(NSURLRequest *)request;
 - (bool) isLoading;
 

-- (void) reloadURLWithCache:(BOOL)cache;
-- (void) reloadURL;
-

 - (id) init;
 
 - (id) initWithURL:(NSURL *)url;
 - (id) init;
 
 - (id) initWithURL:(NSURL *)url;

diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm
index 9c85b29703b54a222dc48e52b9a155c2940ab5b3..580a9ca17cad1b934e79c8479a6fcd51810c4f23 100644 (file)
--- a/CyteKit/WebViewController.mm
+++ b/CyteKit/WebViewController.mm
@@ -220,7 +220,7 @@ float CYScrollViewDecelerationRateNormal;
 
     request_ = request;
 
 
     request_ = request;
 

-    if ([request_ HTTPBody] == nil && [request_ HTTPBodyStream] == nil)
+    if (cache || [request_ HTTPBody] == nil && [request_ HTTPBodyStream] == nil)

         [self loadRequest:request_];
     else {
         UIAlertView *alert = [[[UIAlertView alloc]
         [self loadRequest:request_];
     else {
         UIAlertView *alert = [[[UIAlertView alloc]


@@ -238,10 +238,6 @@ float CYScrollViewDecelerationRateNormal;
     }
 }
 
     }
 }
 

-- (void) reloadURL {
-    [self reloadURLWithCache:YES];
-}
-

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


@@ -961,7 +957,7 @@ float CYScrollViewDecelerationRateNormal;
 }
 
 - (void) reloadButtonClicked {
 }
 
 - (void) reloadButtonClicked {

-    [self reloadURLWithCache:YES];
+    [self reloadURLWithCache:NO];

 }
 
 - (void) _customButtonClicked {
 }
 
 - (void) _customButtonClicked {

diff --git a/MobileCydia.mm b/MobileCydia.mm
index 25de2d826eb8798991c6243c4ca2b78ae1a9554c..d919a7fb8955084718a86c3dccb3a1eadfcdab0c 100644 (file)
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -4798,7 +4798,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         if (button == [alert cancelButtonIndex])
             [self dismissModalViewControllerAnimated:YES];
         else if (button == [alert firstOtherButtonIndex]) {
         if (button == [alert cancelButtonIndex])
             [self dismissModalViewControllerAnimated:YES];
         else if (button == [alert firstOtherButtonIndex]) {

-            [self complete];
+            [self performSelector:@selector(complete) withObject:nil afterDelay:0];

         }
 
         [alert dismissWithClickedButtonIndex:-1 animated:YES];
         }
 
         [alert dismissWithClickedButtonIndex:-1 animated:YES];