Internal help: Fix crash when no transcoders are installed

master
François-Xavier Thomas 5 years ago committed by jvoisin
parent 6a3d301517
commit 73a06879b5
  1. 4
      airsonic-main/src/main/java/org/airsonic/player/controller/InternalHelpController.java

@ -413,9 +413,9 @@ public class InternalHelpController {
File executableLocation = null; File executableLocation = null;
for (String name: Arrays.asList(executableName, String.format("%s.exe", executableName))) { for (String name: Arrays.asList(executableName, String.format("%s.exe", executableName))) {
executableLocation = new File(transcodingService.getTranscodeDirectory(), name); executableLocation = new File(transcodingService.getTranscodeDirectory(), name);
if (executableLocation.exists()) return executableLocation; if (executableLocation != null && executableLocation.exists()) return executableLocation;
executableLocation = lookForExecutable(executableName); executableLocation = lookForExecutable(executableName);
if (executableLocation.exists()) return executableLocation; if (executableLocation != null && executableLocation.exists()) return executableLocation;
} }
return null; return null;
} }

Loading…
Cancel
Save