From 3ad48358549c0daebb7733bf5f3f9bdc4192d501 Mon Sep 17 00:00:00 2001 From: reuk Date: Mon, 24 Aug 2020 12:22:59 +0100 Subject: [PATCH] macOS: Fix getOperatingSystemType when getOSXVersion returns 11.0 instead of 10.16 --- modules/juce_core/native/juce_mac_SystemStats.mm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/modules/juce_core/native/juce_mac_SystemStats.mm b/modules/juce_core/native/juce_mac_SystemStats.mm index 35ad6fb9db..d3552ddfdd 100644 --- a/modules/juce_core/native/juce_mac_SystemStats.mm +++ b/modules/juce_core/native/juce_mac_SystemStats.mm @@ -137,10 +137,17 @@ SystemStats::OperatingSystemType SystemStats::getOperatingSystemType() StringArray parts; parts.addTokens (getOSXVersion(), ".", StringRef()); - const int major = parts[1].getIntValue(); - jassert ((parts[0].getIntValue() == 10 && major > 2) || parts[0].getIntValue() == 11); + const auto major = parts[0].getIntValue(); + const auto minor = parts[1].getIntValue(); - return (OperatingSystemType) (major + MacOSX_10_4 - 4); + if (major == 10) + { + jassert (minor > 2); + return (OperatingSystemType) (minor + MacOSX_10_4 - 4); + } + + jassert (major == 11 && minor == 0); + return MacOSX_11_0; #endif }