summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorobo <obo@openoffice.org>2010-07-29 12:41:44 +0200
committerobo <obo@openoffice.org>2010-07-29 12:41:44 +0200
commit2ae7ed978e22dbb6fc5e84c3dc686ab4bb9e1cec (patch)
treea80e4bab712d11354de25cf8cdacbeaa48d5c3b8 /extensions
parent5ad652d4bd2969082018f03ad80bf683611ab5b9 (diff)
parent232fc9070c8a86f6602cf4134d4b5b8a1cf117a7 (diff)
CWS-TOOLING: integrate CWS dv19
Notes
Notes: split repo tag: components_ooo/DEV300_m86
Diffstat (limited to 'extensions')
-rwxr-xr-x[-rw-r--r--]extensions/source/update/check/updatecheckjob.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index 2444637515d4..0c9ee46d10f0 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