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

[Caolán McNamara (via logerrit)]

 vcl/source/window/dialog.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ad0652ccbf23e67e6f929663398fe4e7717c5cfe
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jun 27 20:50:35 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jun 28 12:32:22 2019 +0200

    Resolves: tdf#126134 EndDialog on disposed dialog
    
    Change-Id: I079fb2bb786b66b843e8e3960643cf2db6387c79
    Reviewed-on: https://gerrit.libreoffice.org/74822
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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;