diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-16 13:53:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-17 11:36:59 +0000 |
| commit | 4bde081f7ebaf3d6e489a50b287f82ccb14de224 (patch) | |
| tree | 5551f3ff0532344a761033a29b1887f21bf05711 /vcl | |
| parent | f3217ade046a723ae7ff9c729ca6691f19581ebb (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/dialog.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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 |