OutputParams PATH fix contd

ps3mediaserver · Aug 9, 2012 · fec6853 · fec6853
1 parent 541d3e5
commit fec6853
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/main/java/net/pms/io/ProcessWrapperImpl.java b/src/main/java/net/pms/io/ProcessWrapperImpl.java
@@ -132,9 +132,19 @@ public void run() {
 			}
 			if (params.env != null && !params.env.isEmpty()) {
 				Map<String,String> environment = pb.environment();
-				String PATH = params.env.get("PATH") + File.pathSeparator + environment.get("PATH");
+				// actual name of system path var is case-sensitive
+				String sysPathKey = PMS.get().isWindows() ? "Path" : "PATH";
+				// as is Map
+				String PATH = params.env.containsKey("PATH") ? params.env.get("PATH") :
+					params.env.containsKey("path") ? params.env.get("path") :
+					params.env.containsKey("Path") ? params.env.get("Path") : null;
+				if (PATH != null) {
+					PATH += (File.pathSeparator + environment.get(sysPathKey));
+				}
 				environment.putAll(params.env);
-				environment.put("PATH", PATH);
+				if (PATH != null) {
+					environment.put(sysPathKey, PATH);
+				}
 			}
 			process = pb.start();
 			PMS.get().currentProcesses.add(process);