summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-01-13 15:18:15 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-01-14 08:47:56 +0000
commit0c1cd678f71e519f5a4e623d93442e046485005a (patch)
tree3352e2b40bc3de2623a3559ed4b3718ebf0d018c
parent098d90920a7aea1cc2ee53a79b909f0eef67ca02 (diff)
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@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit a076a062ceb02bd34a460819db61dcbfbca5c8d7) Reviewed-on: https://gerrit.libreoffice.org/33056 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
-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 eef4c5ab5018..c6fcae325a0d 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