From a24472bd92ea91b92b84bb63e44ad0e92d70f5e7 Mon Sep 17 00:00:00 2001 From: hecomi Date: Tue, 29 Nov 2016 20:02:02 +0900 Subject: [PATCH] fix cursor capture area bug. --- .../Plugins/x86_64/uDesktopDuplication.dll | Bin 75776 -> 75776 bytes .../uDesktopDuplication/Cursor.cpp | 2 +- .../uDesktopDuplication/main.cpp | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll b/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll index bbf2c8c0d60d4d17a7f75d71fae425ae9cc99af2..1c98134534908de95af15e708651430f245b6e26 100644 GIT binary patch delta 9396 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 X0RO7d^w-Q@7?tOEf=};_QOxguV)`J* diff --git a/Plugins/uDesktopDuplication/uDesktopDuplication/Cursor.cpp b/Plugins/uDesktopDuplication/uDesktopDuplication/Cursor.cpp index d6e4fb0..8c4f1b5 100644 --- a/Plugins/uDesktopDuplication/uDesktopDuplication/Cursor.cpp +++ b/Plugins/uDesktopDuplication/uDesktopDuplication/Cursor.cpp @@ -167,7 +167,7 @@ void Cursor::Draw(Monitor* monitor) capturedImageTop = 0; } - if (capturedImageBottom >= monitorHeight) + if (capturedImageBottom >= desktopImageHeight) { capturedImageHeight -= capturedImageBottom - desktopImageHeight; capturedImageBottom = desktopImageHeight - 1; diff --git a/Plugins/uDesktopDuplication/uDesktopDuplication/main.cpp b/Plugins/uDesktopDuplication/uDesktopDuplication/main.cpp index 8402c8b..23205b4 100644 --- a/Plugins/uDesktopDuplication/uDesktopDuplication/main.cpp +++ b/Plugins/uDesktopDuplication/uDesktopDuplication/main.cpp @@ -37,7 +37,6 @@ extern "C" UNITY_INTERFACE_EXPORT void UNITY_INTERFACE_API Finalize() { if (!g_manager) return; - g_manager.reset(); std::queue empty;