fix: Fixed version number parsing

v47-io · May 10, 2024 · f02d74f · f02d74f
1 parent 38cef52
commit f02d74f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/main/kotlin/io/v47/jaffree/process/ProcessRunner.kt b/src/main/kotlin/io/v47/jaffree/process/ProcessRunner.kt
@@ -103,9 +103,6 @@ internal class ProcessRunner<T>(
                     }
 
                     helperFutures.forEach {
-                        if (!it.isDone)
-                            it.cancel(true)
-
                         it.get()
                     }
                 }

diff --git a/src/main/kotlin/io/v47/jaffree/version/VersionInfoProcessHandler.kt b/src/main/kotlin/io/v47/jaffree/version/VersionInfoProcessHandler.kt
@@ -54,9 +54,9 @@ internal class VersionInfoProcessHandler : LinesProcessHandler<VersionInfo>() {
 
         return VersionInfo(
             vm.value,
-            vm.groupValues[1].toInt(),
-            vm.groupValues.getOrNull(2)?.toInt() ?: 0,
-            vm.groupValues.getOrNull(3)?.toInt() ?: 0,
+            vm.groupValues[1].ifBlank { "0" }.toInt(),
+            vm.groupValues[2].ifBlank { "0" }.toInt(),
+            vm.groupValues[3].ifBlank { "0" }.toInt(),
             enabledFeatures,
             disabledFeatures
         )