From 604b6bec9a6304ceccf7e91d6e7cc0d4d29573b1 Mon Sep 17 00:00:00 2001 From: Geoffrey McRae Date: Sun, 1 Nov 2020 04:45:57 +1100 Subject: [PATCH] [host] don't fail if windows is dumb and doesnt give us the cursor info --- host/platform/Windows/capture/DXGI/src/dxgi.c | 16 ++-------------- repos/LGMP | 2 +- repos/PureSpice | 2 +- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/host/platform/Windows/capture/DXGI/src/dxgi.c b/host/platform/Windows/capture/DXGI/src/dxgi.c index d6d451873..725e22057 100644 --- a/host/platform/Windows/capture/DXGI/src/dxgi.c +++ b/host/platform/Windows/capture/DXGI/src/dxgi.c @@ -842,21 +842,9 @@ static CaptureResult dxgi_capture() } CURSORINFO ci = { .cbSize = sizeof(CURSORINFO) }; - if (!GetCursorInfo(&ci)) + ICONINFO ii; + if (GetCursorInfo(&ci) && ci.hCursor && GetIconInfo(ci.hCursor, &ii)) { - DEBUG_WINERROR("GetCursorInfo failed", GetLastError()); - return CAPTURE_RESULT_ERROR; - } - - if (ci.hCursor) - { - ICONINFO ii; - if (!GetIconInfo(ci.hCursor, &ii)) - { - DEBUG_WINERROR("GetIconInfo failed", GetLastError()); - return CAPTURE_RESULT_ERROR; - } - DeleteObject(ii.hbmMask); DeleteObject(ii.hbmColor); diff --git a/repos/LGMP b/repos/LGMP index 0102436ae..2a1477550 160000 --- a/repos/LGMP +++ b/repos/LGMP @@ -1 +1 @@ -Subproject commit 0102436ae24386f731e7b9df75180a2374d8b89b +Subproject commit 2a1477550cc122dcac8af7016ac5f15dec2e139a diff --git a/repos/PureSpice b/repos/PureSpice index 35ecd45b0..4ca2b08d0 160000 --- a/repos/PureSpice +++ b/repos/PureSpice @@ -1 +1 @@ -Subproject commit 35ecd45b0e441a6da2be1069a902985ae33570a1 +Subproject commit 4ca2b08d007c0cd17665f6f19fb160a3c111024b