From 021604471bad757b8964a6d18369247d5ba39328 Mon Sep 17 00:00:00 2001 From: Aaron Culliney Date: Sat, 11 Nov 2017 12:06:26 -0800 Subject: [PATCH] Avoid potential NPE --- .../java/org/deadc0de/apple2ix/Apple2DiskChooserActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DiskChooserActivity.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DiskChooserActivity.java index a347b1f8..2a3601dc 100644 --- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DiskChooserActivity.java +++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DiskChooserActivity.java @@ -158,7 +158,9 @@ public class Apple2DiskChooserActivity extends Activity { public void finish() { sDiskChooserIsChoosing.set(false); String name = chosenUri == null ? "" : chosenUri.toString(); - sDisksCallback.onDisksChosen(new DiskArgs(name, chosenUri, chosenPfd)); + if (sDisksCallback != null) { + sDisksCallback.onDisksChosen(new DiskArgs(name, chosenUri, chosenPfd)); + } super.finish(); }