From 0589915fe642e76a3eae205b2cc626c94973e229 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Mon, 1 Jun 2020 16:31:26 -0400
Subject: [PATCH] android: MainActivity: Fix a nullptr exception with
 onSaveInstanceState.

---
 .../main/java/org/citra/citra_emu/ui/main/MainActivity.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java
index fda8ca599..402c8a4e0 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java
@@ -83,6 +83,12 @@ public final class MainActivity extends AppCompatActivity implements MainView {
     protected void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
         if (PermissionsHandler.hasWriteAccess(this)) {
+            if (getSupportFragmentManager() == null) {
+                return;
+            }
+            if (outState == null) {
+                return;
+            }
             getSupportFragmentManager().putFragment(outState, "mPlatformGamesFragment", mPlatformGamesFragment);
         }
     }