diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-05-25 02:17:06 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-05-30 09:41:23 +0200 |
| commit | d9865d2dd322c505d242927937ad5fd9dcd4d6b7 (patch) | |
| tree | a075ad95a9dd2f809a950c1495c8b226bc944248 /sw/source/uibase/app | |
| parent | 67338c3c91b8a47543d1a79c4d245d2d70f2df62 (diff) | |
tdf#105002 Don't crash on mail wizard recreation
Change-Id: I8af4753cc654ec475d40223a64afa50a9de332ab
Reviewed-on: https://gerrit.libreoffice.org/38007
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
(cherry picked from commit ce40f2798f0fa2f8f6e3084e4bbbd50e749c55d6)
Reviewed-on: https://gerrit.libreoffice.org/38037
(cherry picked from commit 6b921e1c8a4779dfd6f5531842ab89d85aa99a85)
Diffstat (limited to 'sw/source/uibase/app')
| -rw-r--r-- | sw/source/uibase/app/apphdl.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 5e2b80979791..61a9e31b9f08 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -575,6 +575,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 ); @@ -668,6 +669,7 @@ IMPL_LINK_NOARG(SwMailMergeWizardExecutor, CloseFrameHdl, void*, void) m_pView2Close->GetViewFrame()->DoClose(); m_pView2Close = nullptr; } + m_pWizardToDestroyInCallback.disposeAndClear(); } } // namespace |