Remove CanAquireDevice which breaks Acquire() call

elishacloud · Aug 13, 2024 · 7d0a928 · 7d0a928
1 parent 0ba9251
commit 7d0a928
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 18 deletions.
diff --git a/BuildNo.rc b/BuildNo.rc
@@ -1 +1 @@
-#define BUILD_NUMBER 76 
+#define BUILD_NUMBER 77 
diff --git a/IDirectInputDeviceX.cpp b/IDirectInputDeviceX.cpp
@@ -429,12 +429,6 @@ HRESULT m_IDirectInputDeviceX::Acquire()
 {
 	Logging::LogDebug() << __FUNCTION__ << " (" << this << ")";
 
-	if (!CanAquireDevice)
-	{
-		CanAquireDevice = true;
-		return DIERR_NOTINITIALIZED;
-	}
-
 	return ProxyInterface->Acquire();
 }
 
@@ -583,14 +577,7 @@ HRESULT m_IDirectInputDeviceX::SetCooperativeLevel(HWND hwnd, DWORD dwFlags)
 {
 	Logging::LogDebug() << __FUNCTION__ << " (" << this << ")";
 
-	HRESULT hr = ProxyInterface->SetCooperativeLevel(hwnd, dwFlags);
-
-	if (SUCCEEDED(hr))
-	{
-		CanAquireDevice = true;
-	}
-
-	return hr;
+	return ProxyInterface->SetCooperativeLevel(hwnd, dwFlags);
 }
 
 template HRESULT m_IDirectInputDeviceX::GetObjectInfoX<IDirectInputDevice8A, LPDIDEVICEOBJECTINSTANCEA>(LPDIDEVICEOBJECTINSTANCEA, DWORD, DWORD);

diff --git a/IDirectInputDeviceX.h b/IDirectInputDeviceX.h
@@ -21,9 +21,6 @@ class m_IDirectInputDeviceX : public AddressLookupTableDinputObject
 	// Vector to store instances of m_IDirectInputEffect
 	std::vector<m_IDirectInputEffect*> effects;
 
-	// For CooperativeLevel
-	bool CanAquireDevice = false;
-
 	// For GetDeviceData
 	bool IsMouse = false;