From 150fc50317fa8386405de66623e159c996ad76e9 Mon Sep 17 00:00:00 2001 From: Michael Pfaff Date: Fri, 9 Sep 2022 17:04:57 -0400 Subject: [PATCH] Support macOS versions with a patch number --- src/java/org/lwjgl/LWJGLUtil.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/java/org/lwjgl/LWJGLUtil.java b/src/java/org/lwjgl/LWJGLUtil.java index faa99d58..37ef17df 100644 --- a/src/java/org/lwjgl/LWJGLUtil.java +++ b/src/java/org/lwjgl/LWJGLUtil.java @@ -343,11 +343,19 @@ public class LWJGLUtil { } int major; int minor; + int patch; try { major = Integer.parseInt(os_version, 0, dotI, 10); - minor = Integer.parseInt(os_version, dotI + 1, os_version.length(), 10); + int dotI1 = os_version.indexOf('.', dotI + 1); + if (dotI1 == -1) { + minor = Integer.parseInt(os_version, dotI + 1, os_version.length(), 10); + patch = 0; + } else { + minor = Integer.parseInt(os_version, dotI + 1, dotI1, 10); + patch = Integer.parseInt(os_version, dotI1 + 1, os_version.length(), 10); + } } catch (Exception e) { - logger().log("Exception occurred while trying to determine OS version", e); + logger().log("Exception occurred while trying to determine OS version: " + os_version, e); // Best guess, no return false; }