wsd/LOOLWSD.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ee1d96fd053afb6135d04af0571c7f093c509ca3
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Fri Apr 17 10:52:06 2020 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Apr 17 11:33:47 2020 +0200
wsd: 3600000 * 1000 would not fit into an int
Change-Id: Ib1ada4e2c51d1eff846130669255582e2cef097d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92406
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 0796b53dd..9ab86355a 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -3564,8 +3564,8 @@ int LOOLWSD::innerMain()
UnitWSD::get().invokeTest();
// This timeout affects the recovery time of prespawned children.
- const int waitMicroS = UnitWSD::isUnitTesting() ?
- UnitWSD::get().getTimeoutMilliSeconds() * 1000 / 4 :
+ const long waitMicroS = UnitWSD::isUnitTesting() ?
+ static_cast<long>(UnitWSD::get().getTimeoutMilliSeconds()) * 1000
/ 4 :
SocketPoll::DefaultPollTimeoutMicroS * 4;
mainWait.poll(waitMicroS);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
