eden-emu/SDL
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better fix for initializing Android environment variables

Browse source
This commit is contained in:
Sam Lantinga 2024-09-20 11:09:48 -07:00
parent 095fb5f522
commit ea2e2e451d
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/core/android/SDL_android.c
View file

@ -1525,7 +1525,8 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetenv)(
const char *utfvalue = (*env)->GetStringUTFChars(env, value, NULL); const char *utfvalue = (*env)->GetStringUTFChars(env, value, NULL);
// This is only called at startup, to initialize the environment // This is only called at startup, to initialize the environment
SDL_setenv_unsafe(utfname, utfvalue, 1); // Note that we call setenv() directly to avoid affecting SDL environments
setenv(utfname, utfvalue, 1);
(*env)->ReleaseStringUTFChars(env, name, utfname); (*env)->ReleaseStringUTFChars(env, name, utfname);
(*env)->ReleaseStringUTFChars(env, value, utfvalue); (*env)->ReleaseStringUTFChars(env, value, utfvalue);

7
src/stdlib/SDL_getenv.c
View file

@ -122,12 +122,7 @@ SDL_Environment *SDL_CreateEnvironment(bool populated)
#else #else
#ifdef SDL_PLATFORM_ANDROID #ifdef SDL_PLATFORM_ANDROID
// Make sure variables from the application manifest are available // Make sure variables from the application manifest are available
static bool initializing; Android_JNI_GetManifestEnvironmentVariables();
if (!initializing) {
initializing = true;
Android_JNI_GetManifestEnvironmentVariables();
initializing = false;
}
#endif #endif
char **strings = environ; char **strings = environ;
if (strings) { if (strings) {