diff options
| author | sb <sb@openoffice.org> | 2010-09-10 11:13:28 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-09-10 11:13:28 +0200 |
| commit | 955cf2ebc5887f9bd490de4397ae7d08ba7323b8 (patch) | |
| tree | 0f9ad8b01219325a693d8aa688f870fbc656cdda /extensions/source/update/check | |
| parent | e0c05e9654a1317099e788c9fbd92cf953c8b317 (diff) | |
| parent | faea3cb5a9d96bfc897606130cfcb93e61db54bb (diff) | |
sb123: merged in DEV300_m87
Diffstat (limited to 'extensions/source/update/check')
| -rwxr-xr-x[-rw-r--r--] | extensions/source/update/check/updatecheckjob.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx index 04c4d932f..c75530388 100644..100755 --- a/extensions/source/update/check/updatecheckjob.cxx +++ b/extensions/source/update/check/updatecheckjob.cxx @@ -327,13 +327,14 @@ void SAL_CALL UpdateCheckJob::queryTermination( lang::EventObject const & ) } //------------------------------------------------------------------------------ -void SAL_CALL UpdateCheckJob::notifyTermination( lang::EventObject const & rEvt ) +void SAL_CALL UpdateCheckJob::notifyTermination( lang::EventObject const & ) throw ( uno::RuntimeException ) { if ( m_pInitThread.get() != 0 ) + { m_pInitThread->setTerminating(); - - disposing( rEvt ); + m_pInitThread->join(); + } } } // anonymous namespace |