Browse Source

Merge pull request #50928 from Vitika9/50850

Removed Redundant assignement of name inside configure_joypad function
Rémi Verschelde 4 years ago
parent
commit
77ca5e7b21
1 changed files with 2 additions and 1 deletions
  1. 2 1
      platform/osx/joypad_osx.cpp

+ 2 - 1
platform/osx/joypad_osx.cpp

@@ -286,8 +286,9 @@ bool JoypadOSX::configure_joypad(IOHIDDeviceRef p_device_ref, joypad *p_joy) {
 	}
 	if ((!refCF) || (!CFStringGetCString((CFStringRef)refCF, c_name, sizeof(c_name), kCFStringEncodingUTF8))) {
 		name = "Unidentified Joypad";
+	} else {
+		name = c_name;
 	}
-	name = c_name;
 
 	int id = input->get_unused_joy_id();
 	ERR_FAIL_COND_V(id == -1, false);