diff options
| author | Mert Tumer <mert.tumer@collabora.com> | 2022-07-27 21:00:09 +0300 |
|---|---|---|
| committer | Ashod Nakashian <Ashod@users.noreply.github.com> | 2022-07-30 10:52:24 -0400 |
| commit | 6771c3a6aaaf091267925f1b3d9d7b5ed9b91aea (patch) | |
| tree | f762f1b8c4fcbb9ded8fd61f31a1a95269a67c9a | |
| parent | Fix images' alignment within pushbutton control, add flex classes (diff) | |
| download | online-6771c3a6aaaf091267925f1b3d9d7b5ed9b91aea.tar.gz online-6771c3a6aaaf091267925f1b3d9d7b5ed9b91aea.zip | |
android: fix closing the document on interactive dialogs
We get stuck on exitting the app progressbar on mobile
with the interactive dialogs such as csv import or macro security
dialog, we have a different use case for killing the document
as in the normal case. We are not running a separate process
but a thread and we dont trigger regular killing use case.
This piece is not relevant for android because we always have
one connection through fakesocket until the main thread is killed
and it is waiting on the mutex to finish before we finally exit the
document activity.
Signed-off-by: Mert Tumer <mert.tumer@collabora.com>
Change-Id: I99bd333152d40a04f95d4747705a721112317bb2
| -rw-r--r-- | wsd/DocumentBroker.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index 13331147cb..af024feecd 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -2405,9 +2405,11 @@ void DocumentBroker::disconnectSessionInternal(const std::string& id) // csv import dialogs), it will wait for their // dismissal indefinetely. Neither would our // load-timeout kick in, since we would be gone. +#if !MOBILEAPP LOG_INF("Session [" << id << "] disconnected but DocKey [" << _docKey << "] isn't loaded yet. Terminating the child roughly."); _childProcess->terminate(); +#endif } } |