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

[Caolán McNamara (via logerrit)]

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

New commits:
commit d9b32fdee82e05042681a3fd4b634055edfaf00b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jun 27 20:50:35 2019 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Fri Jun 28 17:35:00 2019 +0200

    Resolves: tdf#126134 EndDialog on disposed dialog
    
    Change-Id: I079fb2bb786b66b843e8e3960643cf2db6387c79
    Reviewed-on: https://gerrit.libreoffice.org/74823
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Tested-by: Michael Stahl <Michael.Stahl at cib.de>

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;