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

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Wed Nov 20 16:26:28 UTC 2019


 wsd/ClientSession.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c6497bda19387d93d63b5e103cccaa6968438ceb
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Nov 20 18:19:33 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Nov 20 17:26:09 2019 +0100

    No need to "rescue" the clipboard in the iOS app
    
    Change-Id: I805c14f2405eeed39127bdac29d7c93374ddc942
    Reviewed-on: https://gerrit.libreoffice.org/83340
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 5e3b23547..e0ba29bb2 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -142,10 +142,11 @@ bool ClientSession::disconnectFromKit()
     {
         setState(SessionState::WAIT_DISCONNECT);
 
+#ifndef IOS
         LOG_TRC("request/rescue clipboard on disconnect for " << getId());
         // rescue clipboard before shutdown.
         docBroker->forwardToChild(getId(), "getclipboard");
-
+#endif
         // handshake nicely; so wait for 'disconnected'
         docBroker->forwardToChild(getId(), "disconnect");
 


More information about the Libreoffice-commits mailing list