twix/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2025-12-25 10:22:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Review android_main() in rcore.c (#3121)

Browse Source
This commit is contained in:
Le Juez Victor
2023-06-20 11:01:57 +02:00
committed by GitHub
parent 3a90acf08e
commit 5e1a81555c
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/rcore.c
View File

@ -717,17 +717,17 @@ void android_main(struct android_app *app)
char arg0[] = "raylib"; // NOTE: argv[] are mutable char arg0[] = "raylib"; // NOTE: argv[] are mutable
CORE.Android.app = app; CORE.Android.app = app;
// NOTE: Return codes != 0 are skipped // NOTE: We get the main return for exit()
(void)main(1, (char *[]) { arg0, NULL }); int ret = main(1, (char *[]) { arg0, NULL });
// Finish native activity // Request to end the native activity
ANativeActivity_finish(CORE.Android.app->activity); ANativeActivity_finish(app->activity);
// Android ALooper_pollAll() variables // Android ALooper_pollAll() variables
int pollResult = 0; int pollResult = 0;
int pollEvents = 0; int pollEvents = 0;
// Wait for app events to close // Waiting for application events before complete finishing
while (!CORE.Android.app->destroyRequested) while (!CORE.Android.app->destroyRequested)
{ {
while ((pollResult = ALooper_pollAll(0, NULL, &pollEvents, (void **)&CORE.Android.source)) >= 0) while ((pollResult = ALooper_pollAll(0, NULL, &pollEvents, (void **)&CORE.Android.source)) >= 0)
@ -736,8 +736,11 @@ void android_main(struct android_app *app)
} }
} }
// WARNING: Check for deallocation and ensure no other processes are running from the application // WARNING: Make sure you free resources properly and no other process is running from Java code or other.
exit(0); // Closes the application completely without going through Java // NOTE: You can use JNI to call a NativeLoader method (which will call finish() from the UI thread)
// to handle the full close from Java, without using exit(0) like here.
exit(ret); // Close the application directly, without going through Java
} }
// NOTE: Add this to header (if apps really need it) // NOTE: Add this to header (if apps really need it)