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

[Caolán McNamara (via logerrit)]

 vcl/source/window/dialog.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 213521b339cd39b650564ce8a695da29225012b5
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Jun 14 10:11:38 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jun 14 13:08:03 2019 +0200

    disable 'Quit' when toggling a dialog hierarchy to 'busy'
    
    Change-Id: I28773e983014596f6c6b98ab9846bae0a4b3b9ad
    Reviewed-on: https://gerrit.libreoffice.org/74029
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index ec660bf630b4..faa88a27c1da 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1607,7 +1607,10 @@ void TopLevelWindowLocker::incBusy(const weld::Window* pIgnore)
         pTopWin = Application::GetNextTopLevelWindow(pTopWin);
     }
     for (auto& a : aTopLevels)
+    {
         a->IncModalCount();
+        a->ImplGetFrame()->NotifyModalHierarchy(true);
+    }
     m_aBusyStack.push(aTopLevels);
 }
 
@@ -1619,6 +1622,7 @@ void TopLevelWindowLocker::decBusy()
         if (a->IsDisposed())
             continue;
         a->DecModalCount();
+        a->ImplGetFrame()->NotifyModalHierarchy(false);
     }
     m_aBusyStack.pop();
 }