summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2017-05-25 02:17:06 +0300
committerJan Holesovsky <kendy@collabora.com>2017-05-25 10:16:26 +0200
commitce40f2798f0fa2f8f6e3084e4bbbd50e749c55d6 (patch)
tree794d8c5ea6ed8b693869155a2b342e3bc572f5e3
parentb12e16f8fc186117cbb20cc3866bf052a3d75515 (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>
-rw-r--r--sw/source/uibase/app/apphdl.cxx2
1 files changed, 2 insertions, 0 deletions
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