[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/unx

[Caolán McNamara (via logerrit)]

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

New commits:
commit cb3a18269745fb8cee12885a5064c862f54f8f11
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Aug 11 14:23:14 2020 +0100
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Wed Aug 12 10:51:03 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/+/100511
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 7537300b3536..b8f1b66c4b49 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -4574,7 +4574,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();