sw/source/uibase/app/apphdl.cxx | 2 ++ 1 file changed, 2 insertions(+)
New commits: commit ce40f2798f0fa2f8f6e3084e4bbbd50e749c55d6 Author: Maxim Monastirsky <[email protected]> Date: Thu May 25 02:17:06 2017 +0300 tdf#105002 Don't crash on mail wizard recreation Change-Id: I8af4753cc654ec475d40223a64afa50a9de332ab Reviewed-on: https://gerrit.libreoffice.org/38007 Tested-by: Jenkins <[email protected]> Reviewed-by: Jan Holesovsky <[email protected]> diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 61e98ca892ca..79e4fb4d8ceb 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -566,6 +566,7 @@ IMPL_LINK_NOARG( SwMailMergeWizardExecutor, EndDialogHdl, Dialog&, void ) xMMConfig->SetTargetView(nullptr); // destroy wizard asynchronously + m_pWizardToDestroyInCallback = m_pWizard; Application::PostUserEvent( LINK( this, SwMailMergeWizardExecutor, CloseFrameHdl ), m_pWizard ); @@ -659,6 +660,7 @@ IMPL_LINK_NOARG(SwMailMergeWizardExecutor, CloseFrameHdl, void*, void) m_pView2Close->GetViewFrame()->DoClose(); m_pView2Close = nullptr; } + m_pWizardToDestroyInCallback.disposeAndClear(); } } // namespace _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
