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

[Noel Grandin]

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

New commits:
commit 0c1cd678f71e519f5a4e623d93442e046485005a
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Fri Jan 13 15:18:15 2017 +0200

    tdf#105017 Crash when click a "New Theme..." in Gallery on detached SideBar
    
    Change-Id: I6a3c44a0a08cf036776976d40c985889698c08ac
    Reviewed-on: https://gerrit.libreoffice.org/33041
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit a076a062ceb02bd34a460819db61dcbfbca5c8d7)
    Reviewed-on: https://gerrit.libreoffice.org/33056
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index eef4c5a..c6fcae3 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1039,7 +1039,7 @@ void Dialog::SetModalInputMode( bool bModal )
         // Disable the prev Modal Dialog, because our dialog must close at first,
         // before the other dialog can be closed (because the other dialog
         // is on stack since our dialog returns)
-        if ( mpPrevExecuteDlg && !mpPrevExecuteDlg->IsWindowOrChild( this, true ) )
+        if ( mpPrevExecuteDlg && !mpPrevExecuteDlg->isDisposed() && !mpPrevExecuteDlg->IsWindowOrChild( this, true ) )
             mpPrevExecuteDlg->EnableInput( false, this );
 
         // determine next overlap dialog parent