wsd/DocumentBroker.cpp | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit ee5db61c7cc0cdccbc860c51353b9fb9d7dbc8a8
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Thu Sep 24 15:05:44 2020 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Thu Sep 24 15:01:41 2020 +0200
tdf#136977: Reset the MobileTerminationFlag to false before loop
Otherwise, if it hasn't been noticed and reset to false by
DocumentBroker::DocumentBrokerPoll::continuePolling(), it will stay
true and break things the next time a DocumentBroker thread runs.
Actually I am not sure at all whether MobileTerminationFlag fills any
useful function any more, but let's do a minimal change here. In the
master branch MobileTerminationFlag is gone.
Change-Id: I817f197ae32eabd5f8b5854680cecafe7348c429
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103314
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index d92e1bc75..3a3a7b3f9 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -226,6 +226,10 @@ void DocumentBroker::setupPriorities()
void DocumentBroker::startThread()
{
+#if MOBILEAPP
+ MobileTerminationFlag = false;
+#endif
+
_poll->startThread();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
