From 4bde081f7ebaf3d6e489a50b287f82ccb14de224 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 16 Jan 2017 13:53:00 +0200 Subject: tdf#105017 Crash when click a "New Theme..." in Gallery on detached SideBar caused by VclPtr fixes which meant instead of the dialog staying in an always-zero ref-count state, it went up to a ref-count of 1, then down to zero, which triggered a delete before the dialog had finished displaying. And revert my fix in commit 0c1cd678f71e519f5a4e623d93442e046485005a which just worked around the underlying problem Change-Id: Icb35535dd06a2d1db1016d00d106760847d87430 (cherry picked from commit cd9d8315141c3070f43e145ed4ee390e837eb73f) Reviewed-on: https://gerrit.libreoffice.org/33209 Tested-by: Jenkins Reviewed-by: Noel Grandin --- vcl/source/window/dialog.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vcl') diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index c6fcae325a0d..eef4c5ab5018 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->isDisposed() && !mpPrevExecuteDlg->IsWindowOrChild( this, true ) ) + if ( mpPrevExecuteDlg && !mpPrevExecuteDlg->IsWindowOrChild( this, true ) ) mpPrevExecuteDlg->EnableInput( false, this ); // determine next overlap dialog parent -- cgit