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

Merge pull request #68740 from bruvzg/ios_fixes 

[iOS] Fix getting Unicode executable path, fix error spam on start.
This commit is contained in:
Rémi Verschelde 2022-11-28 08:31:53 +01:00
parent ac2be7c61e 6bf9594cfb
commit 2d1bf56510
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/unix/os_unix.cpp
View File

@ -565,7 +565,7 @@ String OS_Unix::get_executable_path() const {
WARN_PRINT("MAXPATHLEN is too small"); WARN_PRINT("MAXPATHLEN is too small");
} }
String path(resolved_path); String path = String::utf8(resolved_path);
delete[] resolved_path; delete[] resolved_path;
return path; return path;

1
platform/ios/os_ios.h
View File

@ -106,7 +106,6 @@ public:
virtual Error shell_open(String p_uri) override; virtual Error shell_open(String p_uri) override;
void set_user_data_dir(String p_dir);
virtual String get_user_data_dir() const override; virtual String get_user_data_dir() const override;
virtual String get_cache_path() const override; virtual String get_cache_path() const override;

17
platform/ios/os_ios.mm
View File

@ -130,8 +130,6 @@ void OS_IOS::alert(const String &p_alert, const String &p_title) {
void OS_IOS::initialize_core() { void OS_IOS::initialize_core() {
OS_Unix::initialize_core(); OS_Unix::initialize_core();
set_user_data_dir(user_data_dir);
} }
void OS_IOS::initialize() { void OS_IOS::initialize() {
@ -273,13 +271,16 @@ Error OS_IOS::shell_open(String p_uri) {
return OK; return OK;
} }
void OS_IOS::set_user_data_dir(String p_dir) {
Ref<DirAccess> da = DirAccess::open(p_dir);
user_data_dir = da->get_current_dir();
printf("setting data dir to %s from %s\n", user_data_dir.utf8().get_data(), p_dir.utf8().get_data());
}
String OS_IOS::get_user_data_dir() const { String OS_IOS::get_user_data_dir() const {
static bool user_data_dir_set = false;
if (user_data_dir_set) {
String old_dir = user_data_dir;
Ref<DirAccess> da = DirAccess::open(old_dir);
const_cast<OS_IOS *>(this)->user_data_dir = da->get_current_dir();
user_data_dir_set = true;
printf("setting data dir to %s from %s\n", user_data_dir.utf8().get_data(), old_dir.utf8().get_data());
}
return user_data_dir; return user_data_dir;
} }