From 0bebbbaa51c7647389ef9ac886169f6037356460 Mon Sep 17 00:00:00 2001 From: Zhiyi Zhang Date: Tue, 27 Aug 2019 21:06:41 +0800 Subject: [PATCH] msctf: Check TF_GetThreadMgr error in DocumentMgr_Destructor. Thread manager could be already destroyed when calling DocumentMgr_Destructor. This removes the error dialog when closing Unreal Engine 4 games. Signed-off-by: Zhiyi Zhang Signed-off-by: Alexandre Julliard --- dlls/msctf/documentmgr.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index dd49cd022fa..44856db632b 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -77,11 +77,15 @@ static inline EnumTfContext *impl_from_IEnumTfContexts(IEnumTfContexts *iface) static void DocumentMgr_Destructor(DocumentMgr *This) { - ITfThreadMgr *tm; + ITfThreadMgr *tm = NULL; TRACE("destroying %p\n", This); TF_GetThreadMgr(&tm); - ThreadMgr_OnDocumentMgrDestruction(tm, &This->ITfDocumentMgr_iface); + if (tm) + { + ThreadMgr_OnDocumentMgrDestruction(tm, &This->ITfDocumentMgr_iface); + ITfThreadMgr_Release(tm); + } if (This->contextStack[0]) ITfContext_Release(This->contextStack[0]);