[Libreoffice-commits] online.git: kit/Kit.cpp

[Tor Lillqvist (via logerrit)]

 kit/Kit.cpp |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 2154306e57d66a4a962f6beb1e917ff7079852c8
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Mar 13 11:05:23 2020 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Mar 13 10:50:36 2020 +0100

    Make the iOS (and Android?) app work again
    
    Now one can open another document after closing the first one. Turns
    out that throwing an exception to return through the call stack to
    SocketPoll::poll() is not necessary after all. But doing
    document.reset() as before a86508d815013c40e3ae8c494b883e112a7195f2 is
    essential.
    
    Change-Id: I248df78bd9b0d3f0962df2126ca394cb746542b8
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90456
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 8e2b2ddc5..3a3121b43 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -2159,9 +2159,7 @@ protected:
 #else
             LOG_INF("Setting TerminationFlag due to 'exit' command.");
             SigUtil::setTerminationFlag();
-
-            // Not really a logic error, but hey. This is expected to be caught in SocketPoll::poll().
-            throw std::logic_error("exit");
+            document.reset();
 #endif
         }
         else if (tokens.equals(0, "tile") || tokens.equals(0, "tilecombine") || tokens.equals(0, "canceltiles") ||