[Libreoffice-commits] core.git: 2 commits - ios/Module_ios.mk vcl/headless

[Libreoffice Gerrit user]

 ios/Module_ios.mk        |    2 +-
 vcl/headless/svpinst.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 31703196388b455edda1c40fd2b3b536b315848f
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Tue Aug 28 15:08:45 2018 +0300
Commit:     Tor Lillqvist <tml at iki.fi>
CommitDate: Tue Aug 28 15:20:01 2018 +0300

    We do want to initialise m_MainThread on iOS, too
    
    This doesn't make the LibreOfficeLight app work much better, though.
    But at least it doesn't hang its event loop completely, some 10 s
    timer keeps firing. (But nothing sane shows up in the app UI, even if
    some welcome.odt document apparently does get loaded. Clearly
    something is waiting for something else that never happens...)
    
    Change-Id: Ieba22a5e1418d48a7dd6cacda526aca69cced4c3

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 5cfd6247d897..c5d0c89b4778 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -70,8 +70,8 @@ SvpSalInstance::SvpSalInstance( std::unique_ptr<SalYieldMutex> pMutex )
     m_aTimeout.tv_usec      = 0;
     m_nTimeoutMS            = 0;
 
-#ifndef IOS
     m_MainThread = osl::Thread::getCurrentIdentifier();
+#ifndef IOS
     CreateWakeupPipe(true);
 #endif
     if( s_pDefaultInstance == nullptr )
commit 037737fe5acbe874892ff886577530e344273a6c
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Tue Aug 28 13:17:22 2018 +0300
Commit:     Tor Lillqvist <tml at iki.fi>
CommitDate: Tue Aug 28 15:20:00 2018 +0300

    Fix typo
    
    Change-Id: I78571f8494a13f6f8c07f9aee2bf6f8144a48ed2

diff --git a/ios/Module_ios.mk b/ios/Module_ios.mk
index d5b215e2cb82..b70f48264a80 100644
--- a/ios/Module_ios.mk
+++ b/ios/Module_ios.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_targets,ios,\
 	CustomTarget_iOS_setup \
 ))
 
-ifneq ($(ENABLE_IOS_LIBREOFFICELIGHT),)
+ifneq ($(ENABLE_IOS_LIBREOFFICELIGHT_APP),)
 $(eval $(call gb_Module_add_targets,ios,\
 	CustomTarget_iOS_link \
 ))