[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit f6253490c48b1e16becb5baf428ad3505a8ed2e2
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Aug 11 14:23:14 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Aug 11 17:35:15 2020 +0200

    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 at redhat.com>

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();