godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-23 15:16:17 +00:00
Code Releases Wiki Activity

Android: OS.create_instance() should return -1 on failure

Browse Source
This commit is contained in:
David Snopek
2024-11-25 15:58:06 -06:00
parent d09d82d433
commit 38e0532ffa
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/android/java/lib/src/org/godotengine/godot/Godot.kt
View File

@@ -1123,7 +1123,7 @@ class Godot(private val context: Context) {
@Keep @Keep
private fun createNewGodotInstance(args: Array<String>): Int { private fun createNewGodotInstance(args: Array<String>): Int {
return primaryHost?.onNewGodotInstanceRequested(args) ?: 0 return primaryHost?.onNewGodotInstanceRequested(args) ?: -1
} }
@Keep @Keep

2
platform/android/java/lib/src/org/godotengine/godot/GodotFragment.java
View File

@@ -474,7 +474,7 @@ public class GodotFragment extends Fragment implements IDownloaderClient, GodotH
if (parentHost != null) { if (parentHost != null) {
return parentHost.onNewGodotInstanceRequested(args); return parentHost.onNewGodotInstanceRequested(args);
} }
return 0; return -1;
} }
@Override @Override

2
platform/android/java/lib/src/org/godotengine/godot/GodotHost.java
View File

@@ -92,7 +92,7 @@ public interface GodotHost {
* @return the id of the new instance. See {@code onGodotForceQuit} * @return the id of the new instance. See {@code onGodotForceQuit}
*/ */
default int onNewGodotInstanceRequested(String[] args) { default int onNewGodotInstanceRequested(String[] args) {
return 0; return -1;
} }
/** /**

3
platform/android/os_android.cpp
View File

@@ -863,6 +863,9 @@ Error OS_Android::create_process(const String &p_path, const List<String> &p_arg
Error OS_Android::create_instance(const List<String> &p_arguments, ProcessID *r_child_id) { Error OS_Android::create_instance(const List<String> &p_arguments, ProcessID *r_child_id) {
int instance_id = godot_java->create_new_godot_instance(p_arguments); int instance_id = godot_java->create_new_godot_instance(p_arguments);
if (instance_id == -1) {
return FAILED;
}
if (r_child_id) { if (r_child_id) {
*r_child_id = instance_id; *r_child_id = instance_id;
} }