| commit | d9b32fdee82e05042681a3fd4b634055edfaf00b | [log] |
|---|---|---|
| author | Caolán McNamara <caolanm@redhat.com> | Thu Jun 27 20:50:35 2019 +0100 |
| committer | Michael Stahl <Michael.Stahl@cib.de> | Fri Jun 28 17:35:00 2019 +0200 |
| tree | ccc198aa8b6161b45a42f8e7c29bbb034f4ef0eb | |
| parent | 4c993cd7c762b1fca9a674cd2bab7c0e95c78e74 [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>
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index e88d5aa..b95dfb2 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;