godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #50928 from Vitika9/50850

Browse Source 
Removed Redundant assignement of name inside configure_joypad function
This commit is contained in:
Rémi Verschelde 2021-07-27 11:49:36 +02:00 committed by GitHub
commit 77ca5e7b21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platform/osx/joypad_osx.cpp
View File

@ -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))) { if ((!refCF) || (!CFStringGetCString((CFStringRef)refCF, c_name, sizeof(c_name), kCFStringEncodingUTF8))) {
name = "Unidentified Joypad"; name = "Unidentified Joypad";
} else {
name = c_name;
} }
name = c_name;
int id = input->get_unused_joy_id(); int id = input->get_unused_joy_id();
ERR_FAIL_COND_V(id == -1, false); ERR_FAIL_COND_V(id == -1, false);