strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make the iOS (and Android?) app work again

Browse source 
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 a86508d815 is
essential.

Change-Id: I248df78bd9b0d3f0962df2126ca394cb746542b8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90456
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
This commit is contained in:
Tor Lillqvist 2020-03-13 11:05:23 +02:00
parent d4e0835043
commit 2154306e57
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kit/Kit.cpp
View file

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