[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/source

[Libreoffice Gerrit user]

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

New commits:
commit 5f755c6455684338ccdedacdd560e1188e7fca76
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Feb 26 12:11:59 2019 +0000
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Fri Mar 1 10:40:52 2019 +0100

    ignore disposed toplevels
    
    Change-Id: Ib5a9bad2537d43f7b6588dbdb958e4cdd34f7023
    Reviewed-on: https://gerrit.libreoffice.org/68385
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 4b6a019263cc..0c75f85ae8d3 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1569,7 +1569,11 @@ void TopLevelWindowLocker::decBusy()
 {
     // unlock locked toplevel windows from being closed now busy is over
     for (auto& a : m_aBusyStack.top())
+    {
+        if (a->IsDisposed())
+            continue;
         a->DecModalCount();
+    }
     m_aBusyStack.pop();
 }