summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-02-26 12:11:59 +0000
committerMichael Weghorn <m.weghorn@posteo.de>2019-03-01 10:40:52 +0100
commit5f755c6455684338ccdedacdd560e1188e7fca76 (patch)
tree4e57bd7c74c663199d631cfd47ff38ad7f3510f1
parent20acbff2951ed81ff2851a815b0391620785ef21 (diff)
ignore disposed toplevels
Change-Id: Ib5a9bad2537d43f7b6588dbdb958e4cdd34f7023 Reviewed-on: https://gerrit.libreoffice.org/68385 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
-rw-r--r--vcl/source/window/dialog.cxx4
1 files changed, 4 insertions, 0 deletions
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();
}