From a3fc8c69a0894158d80f521944396bf8242fac0a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 Sep 2023 11:34:07 +0100
Subject: [PATCH] Update FontManager.ts (#11673)

(cherry picked from commit 39c4e0c41fa329570a5416b17c4213a71337af77)
---
 src/utils/FontManager.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/utils/FontManager.ts b/src/utils/FontManager.ts
index 089f800aad3..7190646f650 100644
--- a/src/utils/FontManager.ts
+++ b/src/utils/FontManager.ts
@@ -31,10 +31,11 @@ function safariVersionCheck(ua: string): boolean {
             const safariVersionStr = safariVersionMatch[2];
             const macOSVersion = macOSVersionStr.split("_").map((n) => parseInt(n, 10));
             const safariVersion = safariVersionStr.split(".").map((n) => parseInt(n, 10));
-            const colrFontSupported = macOSVersion[0] >= 10 && macOSVersion[1] >= 14 && safariVersion[0] >= 12;
-            // https://www.colorfonts.wtf/ states safari supports COLR fonts from this version on
+            const colrFontSupported =
+                macOSVersion[0] >= 10 && macOSVersion[1] >= 14 && safariVersion[0] >= 12 && safariVersion[0] < 17;
+            // https://www.colorfonts.wtf/ states Safari supports COLR fonts from this version on but Safari 17 breaks it
             logger.log(
-                `COLR support on Safari requires macOS 10.14 and Safari 12, ` +
+                `COLR support on Safari requires macOS 10.14 and Safari 12-16, ` +
                     `detected Safari ${safariVersionStr} on macOS ${macOSVersionStr}, ` +
                     `COLR supported: ${colrFontSupported}`,
             );