From 9e3b7b45d95e6a8fe4af6340569f1d7f356674c4 Mon Sep 17 00:00:00 2001
From: hershey5045 <43485729+hershey5045@users.noreply.github.com>
Date: Tue, 1 Jun 2021 14:21:02 -0700
Subject: [PATCH] Fix window handle retrieval in frame capture system. (#1073)

Capturing screenshots via hydra should work now.
---
 .../Common/Code/Source/FrameCaptureSystemComponent.cpp     | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp b/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp
index f8c1258fc0..0d9e46a418 100644
--- a/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp
@@ -16,6 +16,7 @@
 #include <Atom/RPI.Public/Pass/PassFilter.h>
 #include <Atom/RPI.Public/Pass/RenderPass.h>
 #include <Atom/RPI.Public/Pass/Specific/SwapChainPass.h>
+#include <Atom/RPI.Public/ViewportContextManager.h>
 
 #include <Atom/Utils/DdsFile.h>
 #include <Atom/Utils/PpmFile.h>
@@ -289,11 +290,7 @@ namespace AZ
 
         bool FrameCaptureSystemComponent::CaptureScreenshot(const AZStd::string& filePath)
         {
-            AzFramework::NativeWindowHandle windowHandle = nullptr;
-            AzFramework::WindowSystemRequestBus::BroadcastResult(
-                windowHandle,
-                &AzFramework::WindowSystemRequestBus::Events::GetDefaultWindowHandle);
-
+            AzFramework::NativeWindowHandle windowHandle = AZ::RPI::ViewportContextRequests::Get()->GetDefaultViewportContext()->GetWindowHandle();
             if (windowHandle)
             {
                 return CaptureScreenshotForWindow(filePath, windowHandle);