diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-27 11:49:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-27 11:49:36 +0200 |
| commit | 77ca5e7b217c9ff1160f24a720d9e7a488e426f4 (patch) | |
| tree | 0f1537126dd10f934d0ca723e9a4bce16cb3ae68 /platform/osx/joypad_osx.cpp | |
| parent | 2fa4b59f9900bd7c1d306328db71df168f61b4c5 (diff) | |
| parent | 1add8b3172612d82bd0901824a212114ae60d6c0 (diff) | |
Merge pull request #50928 from Vitika9/50850
Removed Redundant assignement of name inside configure_joypad function
Diffstat (limited to 'platform/osx/joypad_osx.cpp')
| -rw-r--r-- | platform/osx/joypad_osx.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/osx/joypad_osx.cpp b/platform/osx/joypad_osx.cpp index 126ebc1908..d778271350 100644 --- a/platform/osx/joypad_osx.cpp +++ b/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); |