From 3bc34d40a1d36f465b85d712156c7af9aade048f Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Sun, 7 Feb 2021 03:04:37 +1000 Subject: [PATCH] Android: Fix a possible crash when main recreates --- .../com/github/stenzek/duckstation/AndroidHostInterface.java | 4 ++++ .../java/com/github/stenzek/duckstation/MainActivity.java | 1 + 2 files changed, 5 insertions(+) diff --git a/android/app/src/main/java/com/github/stenzek/duckstation/AndroidHostInterface.java b/android/app/src/main/java/com/github/stenzek/duckstation/AndroidHostInterface.java index b7bf4ca80..dab8a5840 100644 --- a/android/app/src/main/java/com/github/stenzek/duckstation/AndroidHostInterface.java +++ b/android/app/src/main/java/com/github/stenzek/duckstation/AndroidHostInterface.java @@ -41,6 +41,10 @@ public class AndroidHostInterface { } } + public void setContext(Context context) { + mContext = context; + } + static public native String getScmVersion(); static public native String getFullScmVersion(); 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 8a7b6fcd5..f84cb212f 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 @@ -175,6 +175,7 @@ public class MainActivity extends AppCompatActivity { throw new RuntimeException("Failed to create host interface"); } + AndroidHostInterface.getInstance().setContext(this); mGameList.refresh(false, false, this); }