From 3d43586e0ff0a8125f02f295d55c0abe7f61c5bf Mon Sep 17 00:00:00 2001
From: Wojciech Figat <wojtek@figat.pl>
Date: Fri, 22 Jul 2022 11:12:45 +0200
Subject: [PATCH] Fix editor viewport input bug regression

---
 Source/Editor/Viewport/EditorViewport.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/Editor/Viewport/EditorViewport.cs b/Source/Editor/Viewport/EditorViewport.cs
index 3329c8a4a..97a58e3de 100644
--- a/Source/Editor/Viewport/EditorViewport.cs
+++ b/Source/Editor/Viewport/EditorViewport.cs
@@ -996,10 +996,10 @@ namespace FlaxEditor.Viewport
 
             // Update input
             var window = win.Window;
-            if (window != null && window.IsFocused && window.IsForegroundWindow)
+            var canUseInput = window != null && window.IsFocused && window.IsForegroundWindow;
             {
                 // Get input buttons and keys (skip if viewport has no focus or mouse is over a child control)
-                var isViewportControllingMouse = IsControllingMouse;
+                var isViewportControllingMouse = canUseInput && IsControllingMouse;
                 if (isViewportControllingMouse != _isViewportControllingMouse)
                 {
                     _isViewportControllingMouse = isViewportControllingMouse;
@@ -1011,7 +1011,7 @@ namespace FlaxEditor.Viewport
                 bool useMouse = IsControllingMouse || (Mathf.IsInRange(_viewMousePos.X, 0, Width) && Mathf.IsInRange(_viewMousePos.Y, 0, Height));
                 _prevInput = _input;
                 var hit = GetChildAt(_viewMousePos, c => c.Visible && !(c is CanvasRootControl));
-                if (ContainsFocus && hit == null)
+                if (canUseInput && ContainsFocus && hit == null)
                     _input.Gather(win.Window, useMouse);
                 else
                     _input.Clear();