[Fix]

OwlHowlinMornSky · Apr 12, 2024 · 804f485 · 804f485
1 parent 48a7d2d
commit 804f485
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/ExampleBasic/ExampleBasic.cpp b/ExampleBasic/ExampleBasic.cpp
@@ -62,12 +62,9 @@ int TestNormal() {
 	auto r_capture = ohms::wgc::ICapture::getInstance();
 	// Find Window.
 	HWND hwnd = FindWindowW(TargetWindowClass, TargetWindowName);
-	if (hwnd == NULL) {
-		return 1;
-	}
 
 	if (TestCaptureMonitor) {
-		HMONITOR hmonitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONULL);
+		HMONITOR hmonitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY);
 		if (hmonitor == NULL) {
 			return 2;
 		}
@@ -76,6 +73,9 @@ int TestNormal() {
 		}
 	}
 	else {
+		if (hwnd == NULL) {
+			return 1;
+		}
 		if (!IsWindow(hwnd) || IsIconic(hwnd)) { // Requirements for capture window.
 			return 4;
 		}
@@ -114,12 +114,9 @@ int TestCallback() {
 	auto r_capture = ohms::wgc::ICapture::getInstance();
 	// Find Window.
 	HWND hwnd = FindWindowW(TargetWindowClass, TargetWindowName);
-	if (hwnd == NULL) {
-		return 1;
-	}
 
 	if (TestCaptureMonitor) {
-		HMONITOR hmonitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONULL);
+		HMONITOR hmonitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY);
 		if (hmonitor == NULL) {
 			return 2;
 		}
@@ -128,6 +125,9 @@ int TestCallback() {
 		}
 	}
 	else {
+		if (hwnd == NULL) {
+			return 1;
+		}
 		if (!IsWindow(hwnd) || IsIconic(hwnd)) { // Requirements for capture window.
 			return 4;
 		}

diff --git a/WGC-Capture-with-OpenCV/include/ohms/WGC.h b/WGC-Capture-with-OpenCV/include/ohms/WGC.h
@@ -30,9 +30,7 @@
 #include <Windows.h>
 #include <opencv2/core/mat.hpp>
 
-#ifdef OHMS_WGC_USE_CALLBACK
 #include <functional>
-#endif // OHMS_WGC_USE_CALLBACK
 
 namespace ohms {
 namespace wgc {