[Libreoffice-commits] online.git: kit/Kit.cpp

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Oct 30 19:37:47 UTC 2018


 kit/Kit.cpp |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 888b529ffcf9941c59d5aa66db05471a4062560f
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Oct 30 21:09:43 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Oct 30 21:09:43 2018 +0200

    For MOBILEAPP, call SocketPoll::wakeupWorld() when lokit_main() is dying
    
    This wakes up the mainWait poll in LOOLWSD::innerMain(), causing the
    process to get back to the clean idle state right away, without having
    to wait for the mainWait poll to get a timeout.
    
    Change-Id: Ifbe586d41661737be2864bedaddf9a40d23501f4

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index cbfa9f01e..46fb1efe4 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -2508,6 +2508,10 @@ void lokit_main(
 
         LOG_INF("Kit poll terminated.");
 
+#ifdef MOBILEAPP
+        SocketPoll::wakeupWorld();
+#endif
+
         // Let forkit handle the jail cleanup.
     }
     catch (const Exception& exc)


More information about the Libreoffice-commits mailing list