desktop/source/lib/init.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 89ef80185c85750115da5fdb166f6cfe0fed8b62
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Sep 5 16:06:27 2025 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Sep 22 13:53:52 2025 +0200
deadlock on iOS if launched from a non-main thread too
The same problem mentioned in:
commit 123c7b80447a2b433e19d0d04be444c4dfdd0551
Date: Mon May 20 23:53:12 2019 +0300
tdf#125397: Fixes for threads and SolarMutex on iOS
happens if launched not from the main thread too.
The need for this in either case needs to be looked into a bit
more.
Change-Id: I05deb87897201c3ff14f28fc858c30876f491681
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190619
Reviewed-by: Skyler Grey <skyler.g...@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
(cherry picked from commit 11967c72b20b27972aa29c246101bb6da39b456a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191315
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 48f9cf9e1812..f83aa26fd509 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -8507,7 +8507,7 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath, const char
desktop::Desktop::GetCommandLineArgs().setHeadless();
#ifdef IOS
- if (InitVCL() && [NSThread isMainThread])
+ if (InitVCL())
{
static bool bFirstTime = true;
if (bFirstTime)
