From 66a5eba473214b6d820cd5a45c58417f232d68ab Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 8 Jul 2016 12:48:17 +0100 Subject: Resolves: tdf#100713 on cancel curData points to deleted parents vector entry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic2f313c357ce9526eb045791e2d27451e52a7572 (cherry picked from commit 17cb84338d6921d012af1e1245f434f90bc25142) Reviewed-on: https://gerrit.libreoffice.org/27039 Tested-by: Jenkins Reviewed-by: Björn Michaelsen --- .../source/deployment/gui/dp_gui_updateinstalldialog.cxx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index dcc017710cc5..f829ea14852c 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -91,7 +91,7 @@ private: virtual void execute() override; void downloadExtensions(); - void download(OUString const & aUrls, UpdateData & aUpdatData); + bool download(OUString const & aUrls, UpdateData & aUpdatData); void installExtensions(); void removeTempDownloads(); @@ -388,8 +388,8 @@ void UpdateInstallDialog::Thread::downloadExtensions() try { OSL_ENSURE(!seqDownloadURLs[j].isEmpty(), "Download URL is empty!"); - download(seqDownloadURLs[j], curData); - if (!curData.sLocalURL.isEmpty()) + bool bCancelled = download(seqDownloadURLs[j], curData); + if (bCancelled || !curData.sLocalURL.isEmpty()) break; } catch ( cssu::Exception & e ) @@ -575,12 +575,12 @@ void UpdateInstallDialog::Thread::removeTempDownloads() } } -void UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, UpdateData & aUpdateData) +bool UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, UpdateData & aUpdateData) { { SolarMutexGuard g; if (m_stop) { - return; + return m_stop; } } @@ -614,12 +614,14 @@ void UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, Update { SolarMutexGuard g; if (m_stop) { - return; + return m_stop; } //all errors should be handled by the command environment. aUpdateData.sLocalURL = destFolder + "/" + sTitle; } } + + return m_stop; } UpdateCommandEnv::UpdateCommandEnv( cssu::Reference< cssu::XComponentContext > const & xCtx, -- cgit v1.2.3