diff options
| author | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2022-01-06 11:34:10 +0200 |
|---|---|---|
| committer | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2022-01-06 14:35:22 +0200 |
| commit | c69e0d16bc8adbe3d984f4f9953412986ed02791 (patch) | |
| tree | c164078533bebe91a544618bf61c0a1045de886a /platform/iphone | |
| parent | 1f0dc026491539ed07f144e0aad29cdfeaa5f66d (diff) | |
Fix multiple missing UTF-8 decoding.
Diffstat (limited to 'platform/iphone')
| -rw-r--r-- | platform/iphone/ios.mm | 2 | ||||
| -rw-r--r-- | platform/iphone/joypad_iphone.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/iphone/ios.mm b/platform/iphone/ios.mm index 91a2e6c228..da21ad0ace 100644 --- a/platform/iphone/ios.mm +++ b/platform/iphone/ios.mm @@ -65,7 +65,7 @@ String iOS::get_model() const { NSString *platform = [NSString stringWithCString:model encoding:NSUTF8StringEncoding]; free(model); const char *str = [platform UTF8String]; - return String(str != nullptr ? str : ""); + return String::utf8(str != nullptr ? str : ""); } String iOS::get_rate_url(int p_app_id) const { diff --git a/platform/iphone/joypad_iphone.mm b/platform/iphone/joypad_iphone.mm index 8c6e546515..2630b42da0 100644 --- a/platform/iphone/joypad_iphone.mm +++ b/platform/iphone/joypad_iphone.mm @@ -159,7 +159,7 @@ void JoypadIPhone::start_processing() { }; // tell Godot about our new controller - Input::get_singleton()->joy_connection_changed(joy_id, true, [controller.vendorName UTF8String]); + Input::get_singleton()->joy_connection_changed(joy_id, true, String::utf8([controller.vendorName UTF8String])); // add it to our dictionary, this will retain our controllers [self.connectedJoypads setObject:controller forKey:[NSNumber numberWithInt:joy_id]]; |