From 1633d8ebb6a1d46ffaa0c86bd1bd88222c653f5b Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Sat, 23 Jul 2022 01:27:40 +0200
Subject: [PATCH] Minor fixes

---
 Source/Engine/Engine/Screen.cpp | 3 ++-
 Source/Engine/UI/GUI/Control.cs | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Source/Engine/Engine/Screen.cpp b/Source/Engine/Engine/Screen.cpp
index c0a61945a..b6cec67c6 100644
--- a/Source/Engine/Engine/Screen.cpp
+++ b/Source/Engine/Engine/Screen.cpp
@@ -1,6 +1,7 @@
 // Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
 
 #include "Screen.h"
+#include "Engine.h"
 #include "Engine/Core/Log.h"
 #include "Engine/Core/Types/Nullable.h"
 #include "Engine/Platform/Window.h"
@@ -102,7 +103,7 @@ void Screen::SetCursorVisible(const bool value)
 #else
 	const auto win = Engine::MainWindow;
 #endif
-    if (win)
+    if (win && Engine::HasGameViewportFocus())
     {
         win->SetCursor(value ? CursorType::Default : CursorType::Hidden);
     }
diff --git a/Source/Engine/UI/GUI/Control.cs b/Source/Engine/UI/GUI/Control.cs
index c9aea0fa9..8384741bc 100644
--- a/Source/Engine/UI/GUI/Control.cs
+++ b/Source/Engine/UI/GUI/Control.cs
@@ -558,7 +558,7 @@ namespace FlaxEngine.GUI
         public void StartMouseCapture(bool useMouseScreenOffset = false)
         {
             var parent = Root;
-            parent.StartTrackingMouse(this, useMouseScreenOffset);
+            parent?.StartTrackingMouse(this, useMouseScreenOffset);
         }
 
         /// <summary>
@@ -568,7 +568,7 @@ namespace FlaxEngine.GUI
         public void EndMouseCapture()
         {
             var parent = Root;
-            parent.EndTrackingMouse();
+            parent?.EndTrackingMouse();
         }
 
         /// <summary>