wsd/LOOLWSD.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9f91b01633de0bcfb2bf6bef930e88dfb0dd45c8
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu Jan 23 10:12:46 2020 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Jan 23 11:18:46 2020 +0100
wsd: fix Android build
Don't just rename the variable, also make sure we get the FD before we
reset our local reference to it.
Change-Id: I676f148874831eaf9f37bdcde1216c58f89229e5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87244
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 64351f94a..db6502eb3 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -3131,12 +3131,12 @@ public:
{
_acceptPoll.startThread();
_acceptPoll.insertNewSocket(_serverSocket);
- _serverSocket.reset();
#if MOBILEAPP
- loolwsd_server_socket_fd = serverSocket->getFD();
+ loolwsd_server_socket_fd = _serverSocket->getFD();
#endif
+ _serverSocket.reset();
WebServerPoll.startThread();
#if !MOBILEAPP
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
