summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-06-27 20:50:35 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-06-28 12:32:22 +0200
commitad0652ccbf23e67e6f929663398fe4e7717c5cfe (patch)
tree4d89ba16e9e7595f413734d739e7cd0b17990135
parent7903b2c1733c2ebb9f1059eb9d191befd1d36baf (diff)
Resolves: tdf#126134 EndDialog on disposed dialog
Change-Id: I079fb2bb786b66b843e8e3960643cf2db6387c79 Reviewed-on: https://gerrit.libreoffice.org/74822 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-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 faa88a27c1da..961cd28ee614 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1122,7 +1122,7 @@ void Dialog::RemoveFromDlgList()
void Dialog::EndDialog( long nResult )
{
- if ( !mbInExecute )
+ if (!mbInExecute || IsDisposed())
return;
const bool bModal = GetType() != WindowType::MODELESSDIALOG;