From ce6a3f53d1cb13a38fc354dd5e2307640103c99c Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 1 Jun 2020 16:28:35 -0400 Subject: [PATCH] android: SettingsFragmentPresenter: Fix a nullptr exception with loadSettingsList. --- .../features/settings/ui/SettingsFragmentPresenter.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java index eb3cfb985..2f28b08bf 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java @@ -99,6 +99,10 @@ public final class SettingsFragmentPresenter { } ArrayList sl = new ArrayList<>(); + if (mMenuTag == null) { + return; + } + switch (mMenuTag) { case SettingsFile.FILE_NAME_CONFIG: addConfigSettings(sl);