From 7d28d1b2abfecfd6e6ca8e1f44739a256c4fe09d Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 13 Aug 2018 18:21:02 +0100
Subject: [PATCH] fix failing unit test.

---
 src/Avalonia.Controls/Primitives/PopupRoot.cs | 23 +++++++++++--------
 .../ContextMenuTests.cs                       |  5 +++-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs
index 996eb6204d..0ae4be5550 100644
--- a/src/Avalonia.Controls/Primitives/PopupRoot.cs
+++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs
@@ -83,19 +83,22 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public void SnapInsideScreenEdges()
         {
-            var screen = Application.Current.MainWindow.Screens.ScreenFromPoint(Position);
+            var screen = Application.Current.MainWindow?.Screens.ScreenFromPoint(Position);
 
-            var screenX = Position.X + Bounds.Width - screen.Bounds.X;
-            var screenY = Position.Y + Bounds.Height - screen.Bounds.Y;
-
-            if (screenX > screen.Bounds.Width)
+            if (screen != null)
             {
-                Position = Position.WithX(Position.X - (screenX - screen.Bounds.Width));
-            }
+                var screenX = Position.X + Bounds.Width - screen.Bounds.X;
+                var screenY = Position.Y + Bounds.Height - screen.Bounds.Y;
 
-            if (screenY > screen.Bounds.Height)
-            {
-                Position = Position.WithY(Position.Y - (screenY - screen.Bounds.Height));
+                if (screenX > screen.Bounds.Width)
+                {
+                    Position = Position.WithX(Position.X - (screenX - screen.Bounds.Width));
+                }
+
+                if (screenY > screen.Bounds.Height)
+                {
+                    Position = Position.WithY(Position.Y - (screenY - screen.Bounds.Height));
+                }
             }
         }
 
diff --git a/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs b/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs
index 94d5caa720..66f0cc3a40 100644
--- a/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs
@@ -64,7 +64,10 @@ namespace Avalonia.Controls.UnitTests
                 {
                     ContextMenu = sut
                 };
-                new Window { Content = target };
+
+                var window = new Window { Content = target };
+
+                Avalonia.Application.Current.MainWindow = window;
 
                 target.RaiseEvent(new PointerReleasedEventArgs
                 {