diff options
| author | Tor Lillqvist <tml@collabora.com> | 2019-05-20 23:53:12 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2019-05-21 02:32:51 +0300 |
| commit | 123c7b80447a2b433e19d0d04be444c4dfdd0551 (patch) | |
| tree | 37f38216f50b7cb16880b315715deff3b401549a /desktop | |
| parent | b26b6cab5d8147d35f76a21c333719c80840d08d (diff) | |
tdf#125397: Fixes for threads and SolarMutex on iOS
We need to call SfxApplication::GetOrCreate() in lo_initialize() now.
Otherwise we will crash in sfx2. No idea why it worked earlier.
I think we want to avoid the "VCLXToolkit VCL main thread" ever
running in the iOS app. I don't think we had it running earlier, but
now for some reason it got started when creating a document from a
template, and that seemed to cause a hang.
Also, when creating a document from a template, lo_initialize() is
called from the app's real main thread (the one that the process
starts in). In that case we do want to release the SolarMutex after
InitVCL() if this was the first time we called InitVCL(). Awful crack.
Not really sure I fully understand all that is going on, but this
change does seem to fix recent problems... All this thread and
SolarMutex stuff is so incredibly fragile.
Change-Id: Ib04498ad199b64f27701f89d2df7003bca316406
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 22a646ef934a..646505603311 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -96,6 +96,7 @@ #include <editeng/fontitem.hxx> #include <editeng/flstitem.hxx> +#include <sfx2/app.hxx> #include <sfx2/objsh.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/viewfrm.hxx> @@ -4598,7 +4599,6 @@ static void lo_runLoop(LibreOfficeKit* /*pThis*/, void* pData) { #ifdef IOS // Maybe ANDROID, too? - InitVCL(); Application::GetSolarMutex().acquire(); #endif @@ -4922,6 +4922,19 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char // CommandLineArgs): desktop::Desktop::GetCommandLineArgs().setHeadless(); +#ifdef IOS + if (InitVCL() && [NSThread isMainThread]) + { + static bool bFirstTime = true; + if (bFirstTime) + { + Application::GetSolarMutex().release(); + bFirstTime = false; + } + } + SfxApplication::GetOrCreate(); +#endif + if (eStage == PRE_INIT) { { |