summaryrefslogtreecommitdiffstats
path: root/wsd/DocumentBroker.cpp
diff options
context:
space:
mode:
authorAshod Nakashian <ashod.nakashian@collabora.co.uk>2022-01-14 20:33:02 -0500
committerJan Holesovsky <holesovsky@gmail.com>2022-01-17 14:08:51 +0100
commitfa24c70242808d10e111b5acb4d2a6bcff3bcc2f (patch)
tree9913c3549d302e2e672e955a68b0136f09f297c8 /wsd/DocumentBroker.cpp
parentwsd: dump the state of the sessions of DocBroker (diff)
downloadonline-fa24c70242808d10e111b5acb4d2a6bcff3bcc2f.tar.gz
online-fa24c70242808d10e111b5acb4d2a6bcff3bcc2f.zip
wsd: do not load a new view when unloading
Recovering from an unloading state has a lot of corner-cases that make it exceedingly tricky to handle correctly. Luckily, if we reject new connections, the client will retry connecting (or at least it can) and that gives very reliable results. Change-Id: I3c06c878cb7a333dd49e153096ce01b356e9815d Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
Diffstat (limited to 'wsd/DocumentBroker.cpp')
-rw-r--r--wsd/DocumentBroker.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 530d5e4b4a..cbec716c80 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -2262,7 +2262,7 @@ std::shared_ptr<ClientSession> DocumentBroker::createNewClientSession(
{
try
{
- if (isMarkedToDestroy())
+ if (isMarkedToDestroy() || _docState.isUnloadRequested())
{
LOG_INF("DocumentBroker ["
<< getDocKey()