vcl/skia/SkiaHelper.cxx | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit e7bd446baa292b65c8b0141f404ce9b684b0abff
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Fri Jul 25 08:14:35 2025 +0200
Commit: Noel Grandin <noelgran...@gmail.com>
CommitDate: Fri Jul 25 14:20:48 2025 +0200
tdf#167642 Restart in safe mode doesn't launch safe mode on macOS
Change-Id: I639a537b3dfaafbd449db18b000fef7bf0e26592
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188313
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
Reviewed-by: Patrick Luby <guibomac...@gmail.com>
diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx
index c23583f3350a..0f0fd04f5843 100644
--- a/vcl/skia/SkiaHelper.cxx
+++ b/vcl/skia/SkiaHelper.cxx
@@ -438,18 +438,17 @@ static bool initVCLSkiaEnabled()
{
const bool bForceSkia = getenv("SAL_FORCESKIA") != nullptr
||
officecfg::Office::Common::VCL::ForceSkia::get();
-
+#if defined(MACOSX) || defined(_WIN32)
+ bRet = true; // macOS/win can __only__ render via skia
+#else
bRet = bForceSkia;
// If not forced, don't enable in safe mode
if (!bRet && !Application::IsSafeModeEnabled())
{
-#if defined(MACOSX) || defined(_WIN32)
- bRet = true; // macOS/win can __only__ render via skia
-#else
bRet = getenv("SAL_ENABLESKIA") != nullptr
|| officecfg::Office::Common::VCL::UseSkia::get();
-#endif
}
+#endif
if (bRet)
{
