Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Moved abort() and update() calls into TransferStatus, also fixed abor…
…t() handling, then-callbacks are now called
  • Loading branch information
Grumbel committed Aug 26, 2014
1 parent 5033c64 commit 1c20c86
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 12 deletions.
10 changes: 0 additions & 10 deletions src/addon/addon_manager.cpp
Expand Up @@ -598,14 +598,4 @@ AddonManager::update()
m_downloader.update();
}

void
AddonManager::abort_install()
{
log_info << "addon install aborted" << std::endl;

m_downloader.abort(m_transfer_status->id);

m_transfer_status = {};
}

/* EOF */
1 change: 0 additions & 1 deletion src/addon/addon_manager.hpp
Expand Up @@ -71,7 +71,6 @@ class AddonManager : public Currenton<AddonManager>
Addon& get_installed_addon(const AddonId& addon);

TransferStatusPtr request_install_addon(const AddonId& addon_id);
void abort_install();
void install_addon(const AddonId& addon_id);
void uninstall_addon(const AddonId& addon_id);

Expand Down
20 changes: 20 additions & 0 deletions src/addon/downloader.cpp
Expand Up @@ -48,6 +48,12 @@ size_t my_curl_physfs_write(void* ptr, size_t size, size_t nmemb, void* userdata

} // namespace

void
TransferStatus::abort()
{
m_downloader.abort(id);
}

void
TransferStatus::update()
{
Expand Down Expand Up @@ -258,8 +264,22 @@ Downloader::abort(TransferId id)
}
else
{
TransferStatusPtr status = (*it)->get_status();

curl_multi_remove_handle(m_multi_handle, (*it)->get_curl_handle());
m_transfers.erase(it);

for(auto& callback : status->callbacks)
{
try
{
callback(false);
}
catch(const std::exception& err)
{
log_warning << "Illegal exception in Downloader: " << err.what() << std::endl;
}
}
}
}

Expand Down
1 change: 1 addition & 0 deletions src/addon/downloader.hpp
Expand Up @@ -53,6 +53,7 @@ class TransferStatus
error_msg()
{}

void abort();
void update();

void then(const std::function<void (bool)>& callback)
Expand Down
2 changes: 1 addition & 1 deletion src/supertux/menu/download_dialog.cpp
Expand Up @@ -84,7 +84,7 @@ DownloadDialog::update_text()
void
DownloadDialog::on_abort()
{
AddonManager::current()->abort_install();
m_status->abort();
}

void
Expand Down

0 comments on commit 1c20c86

Please sign in to comment.