summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-06-27 20:50:35 +0100
committerMichael Stahl <Michael.Stahl@cib.de>2019-06-28 17:35:00 +0200
commitd9b32fdee82e05042681a3fd4b634055edfaf00b (patch)
treeccc198aa8b6161b45a42f8e7c29bbb034f4ef0eb /vcl
parent4c993cd7c762b1fca9a674cd2bab7c0e95c78e74 (diff)
Resolves: tdf#126134 EndDialog on disposed dialog
Change-Id: I079fb2bb786b66b843e8e3960643cf2db6387c79 Reviewed-on: https://gerrit.libreoffice.org/74823 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/dialog.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index e88d5aacaea2..b95dfb299f41 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1092,7 +1092,7 @@ void Dialog::RemoveFromDlgList()
void Dialog::EndDialog( long nResult )
{
- if ( !mbInExecute )
+ if (!mbInExecute || IsDisposed())
return;
const bool bModal = GetType() != WindowType::MODELESSDIALOG;