Added check for Windows version before initialization.

araghon007 · Apr 10, 2019 · b68ed39 · b68ed39
1 parent adc94c9
commit b68ed39
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/Source/WindowsGamingInput/Private/WindowsGamingInputBPLibrary.cpp b/Source/WindowsGamingInput/Private/WindowsGamingInputBPLibrary.cpp
@@ -282,11 +282,24 @@ BOOL CALLBACK InitHandleFunction(
 
 #pragma endregion
 
+bool CompatibilityCheck() {
+	OSVERSIONINFOEX info;
+	ZeroMemory(&info, sizeof(OSVERSIONINFOEX));
+	info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+	GetVersionEx((LPOSVERSIONINFO)& info);
+
+	if (info.dwMajorVersion >= 10) {
+		return true;
+	}
+	else {
+		return false;
+	}
+}
+
 UWindowsGamingInputBPLibrary::UWindowsGamingInputBPLibrary(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
 {
-
-	InitializeGamepad();
+	if (CompatibilityCheck()) InitializeGamepad();
 }
 
 bool UWindowsGamingInputBPLibrary::ApplyVibration(int ControllerIndex, float LeftTrigger, float RightTrigger, float LeftMotor, float RightMotor)
@@ -306,17 +319,6 @@ bool UWindowsGamingInputBPLibrary::ApplyVibration(int ControllerIndex, float Lef
 }
 
 bool UWindowsGamingInputBPLibrary::Compatibility() {
-	OSVERSIONINFOEX info;
-	ZeroMemory(&info, sizeof(OSVERSIONINFOEX));
-	info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-	GetVersionEx((LPOSVERSIONINFO)& info);
-
-	if (info.dwMajorVersion >= 10) {
-		return true;
-	}
-	else {
-		return false;
-	}
+	return CompatibilityCheck();
 }
 
-