diff options
| author | 2024-01-03 21:38:29 -0500 | |
|---|---|---|
| committer | 2024-01-03 22:12:15 -0500 | |
| commit | 1c278974a87b9a94edd4d8b08317071bd36823bf (patch) | |
| tree | 477bd033976d2780f1ed5512a831dadd3c05ea1b | |
| parent | Merge pull request #12554 from german77/directconnect (diff) | |
| download | yuzu-1c278974a87b9a94edd4d8b08317071bd36823bf.tar.gz yuzu-1c278974a87b9a94edd4d8b08317071bd36823bf.tar.xz yuzu-1c278974a87b9a94edd4d8b08317071bd36823bf.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | src/android/app/src/main/jni/android_config.cpp | 6 | ||||
| -rw-r--r-- | src/android/app/src/main/jni/android_config.h | 1 |
2 files changed, 0 insertions, 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 | |||
| 14 | } | 14 | } |
| 15 | } | 15 | } |
| 16 | 16 | ||
| 17 | AndroidConfig::~AndroidConfig() { | ||
| 18 | if (global) { | ||
| 19 | AndroidConfig::SaveAllValues(); | ||
| 20 | } | ||
| 21 | } | ||
| 22 | |||
| 23 | void AndroidConfig::ReloadAllValues() { | 17 | void AndroidConfig::ReloadAllValues() { |
| 24 | Reload(); | 18 | Reload(); |
| 25 | ReadAndroidValues(); | 19 | 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 { | |||
| 9 | public: | 9 | public: |
| 10 | explicit AndroidConfig(const std::string& config_name = "config", | 10 | explicit AndroidConfig(const std::string& config_name = "config", |
| 11 | ConfigType config_type = ConfigType::GlobalConfig); | 11 | ConfigType config_type = ConfigType::GlobalConfig); |
| 12 | ~AndroidConfig() override; | ||
| 13 | 12 | ||
| 14 | void ReloadAllValues() override; | 13 | void ReloadAllValues() override; |
| 15 | void SaveAllValues() override; | 14 | void SaveAllValues() override; |