Browse Source

Fixed crash in hid_init() if the HIDDeviceManager isn't available

Sam Lantinga 1 year ago
parent
commit
34719cba96
1 changed files with 1 additions and 7 deletions
  1. 1 7
      src/hidapi/android/hid.cpp

+ 1 - 7
src/hidapi/android/hid.cpp

@@ -1031,7 +1031,7 @@ extern "C"
 
 int hid_init(void)
 {
-	if ( !g_initialized )
+	if ( !g_initialized && g_HIDDeviceManagerCallbackHandler )
 	{
 		// HIDAPI doesn't work well with Android < 4.3
 		if (SDL_GetAndroidSDKVersion() >= 18) {
@@ -1040,12 +1040,6 @@ int hid_init(void)
 			g_JVM->AttachCurrentThread( &env, NULL );
 			pthread_setspecific( g_ThreadKey, (void*)env );
 
-			if ( !g_HIDDeviceManagerCallbackHandler )
-			{
-				LOGV( "hid_init() without callback handler" );
-				return -1;
-			}
-
 			// Bluetooth is currently only used for Steam Controllers, so check that hint
 			// before initializing Bluetooth, which will prompt the user for permission.
 			bool init_usb = true;