From d3fb90bf6d4aebffbef50f82b9d3dbd3d28a1f0d Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 9 Nov 2020 13:05:06 +0100 Subject: [PATCH] fixed NPE if winDriveLetter is null (on Linux/Mac) --- .../cryptomator/ui/vaultoptions/MountOptionsController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java index 5d65107d0..b638ad889 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java @@ -162,7 +162,9 @@ public class MountOptionsController implements FxController { @Override public String toString(String driveLetter) { - if (occupiedDriveLetters.contains(driveLetter)) { + if (Strings.isNullOrEmpty(driveLetter)) { + return ""; + } else if (occupiedDriveLetters.contains(driveLetter)) { return driveLetter + ": (" + resourceBundle.getString("vaultOptions.mount.winDriveLetterOccupied") + ")"; } else { return driveLetter + ":";