diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-06-05 13:03:22 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-06-05 12:29:55 +0000 |
| commit | 5e5c8d34ed480c62455e24347a5858ea3b84d48c (patch) | |
| tree | 0320d31550e7fe074001f6a33e173be58e89f669 | |
| parent | 875effcdc7cfe38f8d41aac31f8d603ac114be5a (diff) | |
fdo#64962 - ignore exceptions from checking with the update service.
Change-Id: If627b303f8710b915dcbdcb899454631f607e217
Reviewed-on: https://gerrit.libreoffice.org/4164
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
| -rw-r--r-- | extensions/source/update/check/updatecheckjob.cxx | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx index 2360daf7c722..3593a38f9935 100644 --- a/extensions/source/update/check/updatecheckjob.cxx +++ b/extensions/source/update/check/updatecheckjob.cxx @@ -133,11 +133,17 @@ void SAL_CALL InitUpdateCheckJobThread::run() return; } - rtl::Reference< UpdateCheck > aController( UpdateCheck::get() ); - aController->initialize( m_xParameters, m_xContext ); - - if ( m_bShowDialog ) - aController->showDialog( true ); + try { + rtl::Reference< UpdateCheck > aController( UpdateCheck::get() ); + aController->initialize( m_xParameters, m_xContext ); + + if ( m_bShowDialog ) + aController->showDialog( true ); + } catch (const uno::Exception &e) { + // fdo#64962 - don't bring the app down on some unexpected exception. + OSL_TRACE( "Caught init update exception: %s\n thread terminated.\n", + OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() ); + } } void InitUpdateCheckJobThread::setTerminating() { |