From 35d341308189fb65ff2efb5876df8e33f74d2393 Mon Sep 17 00:00:00 2001 From: tobias <thinkdifferent055@gmail.com> Date: Sun, 31 Oct 2021 23:25:29 +0100 Subject: [PATCH] Fix NullPoint on file chooser abort --- .../playpad/layout/desktop/listener/PadNewContentListener.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/listener/PadNewContentListener.java b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/listener/PadNewContentListener.java index fedd12ae..9e3d7ac5 100644 --- a/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/listener/PadNewContentListener.java +++ b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/listener/PadNewContentListener.java @@ -52,7 +52,8 @@ public class PadNewContentListener { if (multiSelect) { selectedFiles = chooser.showOpenMultipleDialog(window); } else { - selectedFiles = Collections.singletonList(chooser.showOpenDialog(window)); + final File selectedFile = chooser.showOpenDialog(window); + selectedFiles = selectedFile == null ? Collections.emptyList() : Collections.singletonList(selectedFile); } if (selectedFiles != null && !selectedFiles.isEmpty()) { -- GitLab