From 8e6b6377e2d5711985269d92aa4301d6fec7d350 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Wed, 12 May 2021 16:38:27 +1000 Subject: [PATCH] Android: Fix possible crash in EmulationActivity --- .../stenzek/duckstation/EmulationActivity.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java b/android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java index 156ee87a2..adef26f01 100644 --- a/android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java +++ b/android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java @@ -821,16 +821,21 @@ public class EmulationActivity extends AppCompatActivity implements SurfaceHolde if (emulationActivity.mGameCoverPath != null && !emulationActivity.mGameCoverPath.isEmpty()) { new ImageLoadTask(coverView).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, emulationActivity.mGameCoverPath); - } else { + } else if (emulationActivity.mGameTitle != null) { new GenerateCoverTask(getContext(), coverView, emulationActivity.mGameTitle) .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } coverView.setOnClickListener(v -> close(true)); - ((TextView)view.findViewById(R.id.title)).setText(emulationActivity.mGameTitle); - final String subtitle = String.format("%s - %s", emulationActivity.mGameCode, - FileHelper.getFileNameForPath(emulationActivity.mGamePath)); - ((TextView)view.findViewById(R.id.subtitle)).setText(subtitle); + if (emulationActivity.mGameTitle != null) + ((TextView)view.findViewById(R.id.title)).setText(emulationActivity.mGameTitle); + + if (emulationActivity.mGameCode != null && emulationActivity.mGamePath != null) + { + final String subtitle = String.format("%s - %s", emulationActivity.mGameCode, + FileHelper.getFileNameForPath(emulationActivity.mGamePath)); + ((TextView)view.findViewById(R.id.subtitle)).setText(subtitle); + } ((ImageButton)view.findViewById(R.id.menu)).setOnClickListener(v -> onMenuClicked()); ((ImageButton)view.findViewById(R.id.controller_settings)).setOnClickListener(v -> onControllerSettingsClicked());