diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-12-07 14:39:38 +0000 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2024-12-19 11:38:01 +0100 |
| commit | 6d68609062842b918db1188d2605aec512e09404 (patch) | |
| tree | 64d5313ee51a50519b5628bd6cb2bf4079fbf206 | |
| parent | 1070d93d7536470d9beed29c7a458646029fb40e (diff) | |
cid#1607671 Data race condition
Change-Id: Id2e87001b77087a072705ba7ffa1a2190220a082
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178074
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
(cherry picked from commit 18399240f2aa976041db1928b1ae9db1a0ad706d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178562
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 757eba8c24c7..022104934d8c 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1129,7 +1129,10 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, if( bMT_EMAIL ) { // Reset internal mail accounting data - m_pImpl->m_xLastMessage.clear(); + { + std::unique_lock aGuard(m_pImpl->m_aAllEmailSendMutex); + m_pImpl->m_xLastMessage.clear(); + } xMailDispatcher.set( new MailDispatcher(rMergeDescriptor.xSmtpServer) ); xMailListener = new MailDispatcherListener_Impl( *this ); |