[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp
Jan Holesovsky (via logerrit)
logerrit at kemper.freedesktop.org
Tue Jun 30 08:54:48 UTC 2020
wsd/DocumentBroker.cpp | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 2c4e4f2e6e98998d566c2445a2f34ec92b851dc0
Author: Jan Holesovsky <kendy at collabora.com>
AuthorDate: Tue Jun 30 10:30:27 2020 +0200
Commit: Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue Jun 30 10:54:29 2020 +0200
android: This assert is iOS-only, ifdef it out.
Change-Id: I2a0dab7069721175983fa426f30422f5fd00e6b8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97474
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index f062e0145..4b3a61d39 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -255,7 +255,9 @@ void DocumentBroker::pollThread()
}
while (!_stop && _poll->continuePolling() && !SigUtil::getTerminationFlag() && !SigUtil::getShutdownRequestFlag());
#else
+#ifdef IOS
assert(_mobileAppDocId > 0);
+#endif
_childProcess = getNewChild_Blocks(_mobileAppDocId);
#endif
More information about the Libreoffice-commits
mailing list