diff options
| author | Léo Lam <leo@leolam.fr> | 2022-01-14 00:04:22 +0100 |
|---|---|---|
| committer | Léo Lam <leo@leolam.fr> | 2022-01-14 00:04:22 +0100 |
| commit | 83c5446d852178794450f7c5833f7a047490ff31 (patch) | |
| tree | c154122215e7dd3917ff4d57ed4d35eeb1b46ee1 /Source/Android/jni/MainAndroid.cpp | |
| parent | 07fd17445c6ca4e89b0cef023ba711bb27c920aa (diff) | |
Fix static initialisation order fiasco issue for Version variables
Fixes a crash that could occur if the static constructor function for
the MainSettings.cpp TU happened to run before the variables in
Common/Version.cpp are initialised. (This is known as the static
initialisation order fiasco.)
By using wrapper functions, those variables are now guaranteed to be
constructed on first use.
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 326995bd39..f32707d993 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -299,13 +299,13 @@ JNIEXPORT double JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetInputRa JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetVersionString(JNIEnv* env, jclass) { - return ToJString(env, Common::scm_rev_str); + return ToJString(env, Common::GetScmRevStr()); } JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetGitRevision(JNIEnv* env, jclass) { - return ToJString(env, Common::scm_rev_git_str); + return ToJString(env, Common::GetScmRevGitStr()); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveScreenShot(JNIEnv*, jclass) |
