[Libreoffice-commits] online.git: 2 commits - wsd/LOOLWSD.cpp

[Libreoffice Gerrit user]

 wsd/LOOLWSD.cpp |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 25e3092a48ae21de508668b1312ca5f3eb2f961f
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Oct 16 01:36:55 2018 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Oct 16 01:40:52 2018 +0300

    Bin pointless #ifdef MOBILEAPP block
    
    BUILDING_TESTS is not true for the mobile app either.
    
    Change-Id: I54de357c25b7349aaa9c06f054cd8fbfddfb7a37

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index d5cf6cddc..1b5dd8917 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2822,7 +2822,6 @@ private:
 
         std::shared_ptr<ServerSocket> socket = getServerSocket(
             ClientListenAddr, port, WebServerPoll, factory);
-#ifdef MOBILEAPP
 #ifdef BUILDING_TESTS
         while (!socket)
         {
@@ -2832,7 +2831,6 @@ private:
                 ServerSocket::Type::Public, port, WebServerPoll, factory);
         }
 #endif
-#endif
         if (!socket)
         {
             LOG_FTL("Failed to listen on Server port(s) (" <<
commit 8f86e63563d9356c395e25619d937c7f38102d05
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Oct 15 23:49:48 2018 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Oct 16 01:36:01 2018 +0300

    Call fakeSocketDumpState() when LOOLWSD::main() is about to return

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 1468d28c1..d5cf6cddc 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -3130,6 +3130,11 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
     UnitWSD::get().returnValue(returnValue);
 
     LOG_INF("Process [loolwsd] finished.");
+
+#ifdef MOBILEAPP
+    fakeSocketDumpState();
+#endif
+
     return returnValue;
 }