summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-08-11 14:23:14 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-08-11 17:35:15 +0200
commitf6253490c48b1e16becb5baf428ad3505a8ed2e2 (patch)
tree494f5baf286a9d46dc42d863a1d7e6840fa6a99d /vcl/unx
parentba6ab05a2a1ecd557302e238e1890b5e631c28b7 (diff)
tdf#135567 for async case need an alternative check for dialog in execution
Change-Id: I326b891b61f8a9848b56b2f26a80af80ab045dec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100501 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/gtk3/gtk3gtkinst.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index edd06fba3f29..8f227854d966 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -4608,7 +4608,10 @@ public:
b) the validity dialog in calc
*/
- if (m_aDialogRun.loop_is_running())
+ // tdf#135567 we know we are running in the sync case if loop_is_running is true
+ // but for the async case we instead check for m_xDialogController which is set in
+ // runAsync and cleared in asyncresponse
+ if (m_aDialogRun.loop_is_running() || m_xDialogController)
{
if (bModal)
m_aDialogRun.inc_modal_count();