Merge pull request #66 from jimmaye/keywindow-fix

Bugfix for PR #63
corin8823 · Apr 10, 2017 · 4d178a5 · 4d178a5
2 parents 882b764 + 8e96460
commit 4d178a5
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/Classes/Popover.swift b/Classes/Popover.swift
@@ -174,7 +174,10 @@ open class Popover: UIView {
   }
 
   open func showAsDialog(_ contentView: UIView) {
-    self.showAsDialog(contentView, inView: UIApplication.shared.windows.first!)
+    guard let rootView = UIApplication.shared.windows.last ?? UIApplication.shared.keyWindow else {
+        return
+    }
+    self.showAsDialog(contentView, inView: rootView)
   }
 
   open func showAsDialog(_ contentView: UIView, inView: UIView) {
@@ -185,7 +188,10 @@ open class Popover: UIView {
   }
 
   open func show(_ contentView: UIView, fromView: UIView) {
-    self.show(contentView, fromView: fromView, inView: UIApplication.shared.windows.first!)
+    guard let rootView = UIApplication.shared.windows.last ?? UIApplication.shared.keyWindow else {
+        return
+    }
+    self.show(contentView, fromView: fromView, inView: rootView)
   }
 
   open func show(_ contentView: UIView, fromView: UIView, inView: UIView) {
@@ -205,7 +211,10 @@ open class Popover: UIView {
   }
 
   open func show(_ contentView: UIView, point: CGPoint) {
-    self.show(contentView, point: point, inView: UIApplication.shared.windows.first!)
+    guard let rootView = UIApplication.shared.windows.last ?? UIApplication.shared.keyWindow else {
+        return
+    }
+    self.show(contentView, point: point, inView: rootView)
   }
 
   open func show(_ contentView: UIView, point: CGPoint, inView: UIView) {