Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-10-23 07:35:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Android: Fix possible crash in EmulationActivity

Browse source
This commit is contained in:
Connor McLaughlin 2021-05-12 16:38:27 +10:00
parent 69fb8de644
commit 8e6b6377e2
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java
View file

@ -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());