From 1c278974a87b9a94edd4d8b08317071bd36823bf Mon Sep 17 00:00:00 2001 From: t895 Date: Wed, 3 Jan 2024 21:38:29 -0500 Subject: android: Don't save settings on config destruction Android doesn't have a proper way of destroying its config object so it's best to stick to the built-in methods to control saving config --- src/android/app/src/main/jni/android_config.cpp | 6 ------ src/android/app/src/main/jni/android_config.h | 1 - 2 files changed, 7 deletions(-) diff --git a/src/android/app/src/main/jni/android_config.cpp b/src/android/app/src/main/jni/android_config.cpp index c86aa1c39..08aed3216 100644 --- a/src/android/app/src/main/jni/android_config.cpp +++ b/src/android/app/src/main/jni/android_config.cpp @@ -14,12 +14,6 @@ AndroidConfig::AndroidConfig(const std::string& config_name, ConfigType config_t } } -AndroidConfig::~AndroidConfig() { - if (global) { - AndroidConfig::SaveAllValues(); - } -} - void AndroidConfig::ReloadAllValues() { Reload(); ReadAndroidValues(); diff --git a/src/android/app/src/main/jni/android_config.h b/src/android/app/src/main/jni/android_config.h index d83852de9..693e1e3f0 100644 --- a/src/android/app/src/main/jni/android_config.h +++ b/src/android/app/src/main/jni/android_config.h @@ -9,7 +9,6 @@ class AndroidConfig final : public Config { public: explicit AndroidConfig(const std::string& config_name = "config", ConfigType config_type = ConfigType::GlobalConfig); - ~AndroidConfig() override; void ReloadAllValues() override; void SaveAllValues() override; -- cgit v1.2.3