Kaydet (Commit) ab99c08d authored tarafından Mike Kaganski's avatar Mike Kaganski

Cleanup event properly; handle error from MsgWaitForMultipleObjects

Commit 11a2809e follow-up

Change-Id: Id70a95f46655ade3b867e0377ddd5bee13993187
Reviewed-on: https://gerrit.libreoffice.org/67402
Tested-by: Jenkins
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst 3346947b
......@@ -108,6 +108,9 @@ namespace /* private */
break;
}
default: // WAIT_FAILED?
return false;
}
}
}
......@@ -268,6 +271,10 @@ CMtaOleClipboard::~CMtaOleClipboard( )
m_bRunClipboardNotifierThread = false;
SetEvent( m_hTerminateClipboardChangedNotifierEvent );
// unblock whoever could still wait for event processing
if (m_hEvtWndDisposed)
SetEvent(m_hEvtWndDisposed);
sal_uInt32 dwResult = WaitForSingleObject(
m_hClipboardChangedNotifierThread, MAX_WAIT_SHUTDOWN );
......@@ -297,6 +304,9 @@ CMtaOleClipboard::~CMtaOleClipboard( )
if ( nullptr != m_hEvtThrdReady )
CloseHandle( m_hEvtThrdReady );
if (m_hEvtWndDisposed)
CloseHandle(m_hEvtWndDisposed);
if ( m_MtaOleReqWndClassAtom )
UnregisterClassW( g_szWndClsName, nullptr );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment