Merge pull request cruffenach#183 from vladzz/master

Fixes a crashing issue on snapshot between iOS7 and iOS8
fkellll · Oct 17, 2015 · 620fef2 · 620fef2
2 parents 3f7d99e + 1a72072
commit 620fef2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/CRToast/CRToast.h b/CRToast/CRToast.h
@@ -7,6 +7,8 @@
 #import "CRToastManager.h"
 #import <UIKit/UIKit.h>
 
+#define IS_OS_8_OR_LATER    ([[[UIDevice currentDevice] systemVersion] floatValue] >= 8.0)
+
 @class CRToastSwipeGestureRecognizer, CRToastTapGestureRecognizer;
 
 /**

diff --git a/CRToast/CRToastLayoutHelpers.h b/CRToast/CRToastLayoutHelpers.h
@@ -205,7 +205,13 @@ static CGRect CRGetNotificationContainerFrame(UIInterfaceOrientation statusBarOr
 
 /// Get view snapshot. If `underStatusBar` it will get key windows root view controller. Otherwise it'll get the mainscreens snapshot
 static UIView *CRStatusBarSnapShotView(BOOL underStatusBar) {
-    return underStatusBar ?
-    [[UIApplication sharedApplication].keyWindow.rootViewController.view snapshotViewAfterScreenUpdates:YES] :
-    [[UIScreen mainScreen] snapshotViewAfterScreenUpdates:YES];
-}
+    if(IS_OS_8_OR_LATER){
+        return underStatusBar ?
+        [[UIApplication sharedApplication].keyWindow.rootViewController.view snapshotViewAfterScreenUpdates:YES] :
+        [[UIScreen mainScreen] snapshotViewAfterScreenUpdates:YES];
+    } else {
+        return underStatusBar ?
+        [[UIApplication sharedApplication].keyWindow.rootViewController.view snapshotViewAfterScreenUpdates:NO] :
+        [[UIScreen mainScreen] snapshotViewAfterScreenUpdates:NO];
+    }
+}