From 73a06879b5384496e674629ac04dc724183fa516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Thomas?= Date: Tue, 11 Feb 2020 23:05:58 +0100 Subject: [PATCH] Internal help: Fix crash when no transcoders are installed --- .../airsonic/player/controller/InternalHelpController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/InternalHelpController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/InternalHelpController.java index afd92aa8..f31fa1c8 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/InternalHelpController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/InternalHelpController.java @@ -413,9 +413,9 @@ public class InternalHelpController { File executableLocation = null; for (String name: Arrays.asList(executableName, String.format("%s.exe", executableName))) { executableLocation = new File(transcodingService.getTranscodeDirectory(), name); - if (executableLocation.exists()) return executableLocation; + if (executableLocation != null && executableLocation.exists()) return executableLocation; executableLocation = lookForExecutable(executableName); - if (executableLocation.exists()) return executableLocation; + if (executableLocation != null && executableLocation.exists()) return executableLocation; } return null; }