From 4c3d2cd3fe62c345cdf0f27fe4295f35c2d86c71 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Sun, 21 Mar 2021 17:22:32 +1000 Subject: [PATCH] Android: Stop activity recreate when theme is set Hopefully will fix those crashes on startup. --- .../java/com/github/stenzek/duckstation/MainActivity.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/android/app/src/main/java/com/github/stenzek/duckstation/MainActivity.java b/android/app/src/main/java/com/github/stenzek/duckstation/MainActivity.java index 27d749066..5adced4c1 100644 --- a/android/app/src/main/java/com/github/stenzek/duckstation/MainActivity.java +++ b/android/app/src/main/java/com/github/stenzek/duckstation/MainActivity.java @@ -137,14 +137,15 @@ public class MainActivity extends AppCompatActivity { .beginTransaction() .setReorderingAllowed(true). replace(R.id.content_fragment, listFragment) - .commit(); + .commitAllowingStateLoss(); } @Override protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); loadSettings(); + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar);