make weak reference to old window

kyoji2 · kyoji2 · commit d5e21567bac5 · 2013-09-09T23:09:51.000+08:00
diff --git a/SIAlertView/SIAlertView.m b/SIAlertView/SIAlertView.m
@@ -39,7 +39,7 @@
 @interface SIAlertView ()
 
 @property (nonatomic, strong) NSMutableArray *items;
-@property (nonatomic, strong) UIWindow *oldKeyWindow;
+@property (nonatomic, weak) UIWindow *oldKeyWindow;
 @property (nonatomic, strong) UIWindow *alertWindow;
 @property (nonatomic, assign, getter = isVisible) BOOL visible;
 
@@ -308,6 +308,10 @@ - (void)addButtonWithTitle:(NSString *)title type:(SIAlertViewButtonType)type ha
 
 - (void)show
 {
+    if (self.isVisible) {
+        return;
+    }
+    
     self.oldKeyWindow = [[UIApplication sharedApplication] keyWindow];
 
     if (![[SIAlertView sharedQueue] containsObject:self]) {
@@ -318,10 +322,6 @@ - (void)show
         return; // wait for next turn
     }
     
-    if (self.isVisible) {
-        return;
-    }
-    
     if ([SIAlertView currentAlertView].isVisible) {
         SIAlertView *alert = [SIAlertView currentAlertView];
         [alert dismissAnimated:YES cleanup:NO];
@@ -445,8 +445,13 @@ - (void)dismissAnimated:(BOOL)animated cleanup:(BOOL)cleanup
         }
     }
     
-    [self.oldKeyWindow makeKeyWindow];
-    self.oldKeyWindow.hidden = NO;
+    
+    UIWindow *window = self.oldKeyWindow;
+    if (!window) {
+        window = [UIApplication sharedApplication].windows[0];
+    }
+    [window makeKeyWindow];
+    window.hidden = NO;
 }
 
 #pragma mark - Transitions
