Fix issue with activating/deactivating FocusMode.

Signed-off-by: John <jonawals@amazon.com>
2021-10-13 18:19:06 +01:00
parent ccb686b0fc
commit 65f3f26339
1 changed files with 3 additions and 3 deletions
@@ -71,9 +71,6 @@ namespace AzToolsFramework
            return;
        }

-        m_focusRoot = entityId;
-        FocusModeNotificationBus::Broadcast(&FocusModeNotifications::OnEditorFocusChanged, m_focusRoot);
-
        if (auto tracker = AZ::Interface<ViewportEditorModeTrackerInterface>::Get();
            tracker != nullptr)
        {
@@ -86,6 +83,9 @@ namespace AzToolsFramework
                tracker->DeactivateMode({ GetEntityContextId() }, ViewportEditorMode::Focus);
            }
        }
+
+        m_focusRoot = entityId;
+        FocusModeNotificationBus::Broadcast(&FocusModeNotifications::OnEditorFocusChanged, m_focusRoot);
    }

    void FocusModeSystemComponent::ClearFocusRoot([[maybe_unused]] AzFramework::EntityContextId entityContextId)