From efbc757369cc6f5e7029b0db58ffda628a6a6073 Mon Sep 17 00:00:00 2001
From: Ari Vuollet <ari.vuollet@kapsi.fi>
Date: Sat, 16 Sep 2023 23:23:50 +0300
Subject: [PATCH] Cancel camera rotation toggle when entering playmode or
 hitting escape

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

diff --git a/Source/Editor/Viewport/EditorViewport.cs b/Source/Editor/Viewport/EditorViewport.cs
index 9ecd7107b..34dbe561c 100644
--- a/Source/Editor/Viewport/EditorViewport.cs
+++ b/Source/Editor/Viewport/EditorViewport.cs
@@ -1077,8 +1077,8 @@ namespace FlaxEditor.Viewport
                 _isControllingMouse = _input.IsControllingMouse;
 
                 // Simulate holding mouse right down for trackpad users
-                if (_prevInput.IsMouseRightDown && !_input.IsMouseRightDown)
-                    _isVirtualMouseRightDown = false;
+                if ((_prevInput.IsMouseRightDown && !_input.IsMouseRightDown) || win.GetKeyDown(KeyboardKeys.Escape))
+                    _isVirtualMouseRightDown = false; // Cancel when mouse right or escape is pressed
                 if (_wasVirtualMouseRightDown)
                     wasControllingMouse = true;
                 if (_isVirtualMouseRightDown) 
@@ -1385,6 +1385,7 @@ namespace FlaxEditor.Viewport
             {
                 OnControlMouseEnd(RootWindow.Window);
                 _isControllingMouse = false;
+                _isVirtualMouseRightDown = false;
             }
         }