From 84cd298084fa620890dfdb65b0650612fa95e7f1 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Fri, 20 Sep 2024 12:10:29 +0200 Subject: [PATCH] rhi: d3d: Gracefully handle EnumOutputs failures Fixes: QTBUG-129147 Pick-to: 6.7 6.5 Change-Id: Idec2678135ae4622537bece35c4253d933655b10 Reviewed-by: Andy Nichols (cherry picked from commit d36dde37401fa5d56c4451059e8b8ec2bc06419d) Reviewed-by: Qt Cherry-pick Bot --- src/gui/rhi/qrhid3dhelpers.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/rhi/qrhid3dhelpers.cpp b/src/gui/rhi/qrhid3dhelpers.cpp index 216c358cbe0..920446fbd9b 100644 --- a/src/gui/rhi/qrhid3dhelpers.cpp +++ b/src/gui/rhi/qrhid3dhelpers.cpp @@ -18,6 +18,8 @@ bool output6ForWindow(QWindow *w, IDXGIAdapter1 *adapter, IDXGIOutput6 **result) IDXGIOutput *currentOutput = nullptr; IDXGIOutput *output = nullptr; for (UINT i = 0; adapter->EnumOutputs(i, &output) != DXGI_ERROR_NOT_FOUND; ++i) { + if (!output) + continue; DXGI_OUTPUT_DESC desc; output->GetDesc(&desc); const RECT r = desc.DesktopCoordinates;