[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Nov 7 22:17:10 UTC 2018
wsd/DocumentBroker.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 802cb3bd24605fc479f2bbd9967a40ee51e6f757
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Nov 8 00:11:21 2018 +0200
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Wed Nov 7 23:16:49 2018 +0100
Move initailisation of 'now' variable back after the poll where it should be
Was moved before the poll in my
75438baa70a0d15b18c5ca829b3e3b1307a27c08.
Change-Id: I0ec99c0c1433d2e5d631720f003905cbd18206aa
Reviewed-on: https://gerrit.libreoffice.org/63052
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
Tested-by: Michael Meeks <michael.meeks at collabora.com>
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index dcef3df3e..7b56fc651 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -256,10 +256,10 @@ void DocumentBroker::pollThread()
// Main polling loop goodness.
while (!_stop && _poll->continuePolling() && !TerminationFlag)
{
- const auto now = std::chrono::steady_clock::now();
-
_poll->poll(SocketPoll::DefaultPollTimeoutMs);
+ const auto now = std::chrono::steady_clock::now();
+
#ifndef MOBILEAPP
if (std::chrono::duration_cast<std::chrono::milliseconds>
(now - lastBWUpdateTime).count() >= 5 * 1000)
More information about the Libreoffice-commits
mailing list