diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 11:12:52 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 11:12:52 +0000 |
| commit | 055ef6e7a4a1fd2c3c4420df75418bfc18c2dfd0 (patch) | |
| tree | 004b5f39e7ec8659c44946247f430bcf73c39763 /desktop | |
| parent | 3d1856f3fea58b97618ee7bd1ccdcbbbebbb467a (diff) | |
INTEGRATION: CWS native172 (1.17.72); FILE MERGED
2008/07/17 08:50:40 dv 1.17.72.1: #i91692# Check alive status before accessing member variables
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index a902a6d64f0a..595c0d1afbcb 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dp_gui_updatedialog.cxx,v $ - * $Revision: 1.17 $ + * $Revision: 1.18 $ * * This file is part of OpenOffice.org. * @@ -551,13 +551,25 @@ bool UpdateDialog::Thread::update( const ::boost::optional< ::rtl::OUString> updateWebsiteURL(infoset.getLocalizedUpdateWebsiteURL()); rtl::OUStringBuffer b(package->getDisplayName()); b.append(static_cast< sal_Unicode >(' ')); - b.append(m_dialog.m_version); + { + vos::OGuard g( Application::GetSolarMutex() ); + if ( m_stop ) + return !m_stop; + else + b.append(m_dialog.m_version); + } b.append(static_cast< sal_Unicode >(' ')); b.append(infoset.getVersion()); if (updateWebsiteURL) { b.append(static_cast< sal_Unicode >(' ')); - b.append(m_dialog.m_browserbased); + { + vos::OGuard g( Application::GetSolarMutex() ); + if ( m_stop ) + return !m_stop; + else + b.append(m_dialog.m_browserbased); + } } du.name = b.makeStringAndClear(); |