Fix BspPathUtil defaultVmfPath

rihi · rihi · commit 09222db0dc45 · 2023-09-02T02:03:55.000+02:00
diff --git a/bspsrc-app/src/main/java/info/ata4/bspsrc/app/util/BspPathUtil.java b/bspsrc-app/src/main/java/info/ata4/bspsrc/app/util/BspPathUtil.java
@@ -11,6 +11,8 @@ public static Path defaultVmfPath(Path bspPath, Path vmfDirPath) {
 			vmfDirPath = bspPath.getParent();
 
 		String base = PathUtil.nameWithoutExtension(bspPath).orElse("");
-		return vmfDirPath.resolve(base + "_d.vmf");
+
+		Path fileName = Path.of(base + "_d.vmf");
+		return vmfDirPath == null ? fileName : vmfDirPath.resolve(fileName);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@ public static Path defaultVmfPath(Path bspPath, Path vmfDirPath) {`
`11`	`11`	`vmfDirPath = bspPath.getParent();`
`12`	`12`
`13`	`13`	`String base = PathUtil.nameWithoutExtension(bspPath).orElse("");`
`14`		`- return vmfDirPath.resolve(base + "_d.vmf");`
	`14`	`+`
	`15`	`+ Path fileName = Path.of(base + "_d.vmf");`
	`16`	`+ return vmfDirPath == null ? fileName : vmfDirPath.resolve(fileName);`
`15`	`17`	`}`
`16`	`18`	`}`