asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only display the assetlib Retry button if the download failed

Browse source 
(cherry picked from commit 508011a57f)
This commit is contained in:
Hugo Locurcio 2021-02-17 02:00:22 +01:00 committed by Rémi Verschelde
parent 61c00938a2
commit 972e7bd27c
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
editor/plugins/asset_library_editor_plugin.cpp
View file

@ -373,7 +373,7 @@ void EditorAssetLibraryItemDownload::_http_download_completed(int p_status, int
if (sha256 != download_sha256) { if (sha256 != download_sha256) {
error_text = TTR("Bad download hash, assuming file has been tampered with.") + "\n"; error_text = TTR("Bad download hash, assuming file has been tampered with.") + "\n";
error_text += TTR("Expected:") + " " + sha256 + "\n" + TTR("Got:") + " " + download_sha256; error_text += TTR("Expected:") + " " + sha256 + "\n" + TTR("Got:") + " " + download_sha256;
status->set_text(TTR("Failed sha256 hash check")); status->set_text(TTR("Failed SHA-256 hash check"));
} }
} }
} break; } break;
@ -382,6 +382,8 @@ void EditorAssetLibraryItemDownload::_http_download_completed(int p_status, int
if (error_text != String()) { if (error_text != String()) {
download_error->set_text(TTR("Asset Download Error:") + "\n" + error_text); download_error->set_text(TTR("Asset Download Error:") + "\n" + error_text);
download_error->popup_centered_minsize(); download_error->popup_centered_minsize();
// Let the user retry the download.
retry->show();
return; return;
} }
@ -488,6 +490,9 @@ void EditorAssetLibraryItemDownload::_install() {
} }
void EditorAssetLibraryItemDownload::_make_request() { void EditorAssetLibraryItemDownload::_make_request() {
// Hide the Retry button if we've just pressed it.
retry->hide();
download->cancel_request(); download->cancel_request();
download->set_download_file(EditorSettings::get_singleton()->get_cache_dir().plus_file("tmp_asset_" + itos(asset_id)) + ".zip"); download->set_download_file(EditorSettings::get_singleton()->get_cache_dir().plus_file("tmp_asset_" + itos(asset_id)) + ".zip");
@ -552,6 +557,8 @@ EditorAssetLibraryItemDownload::EditorAssetLibraryItemDownload() {
retry = memnew(Button); retry = memnew(Button);
retry->set_text(TTR("Retry")); retry->set_text(TTR("Retry"));
retry->connect("pressed", this, "_make_request"); retry->connect("pressed", this, "_make_request");
// Only show the Retry button in case of a failure.
retry->hide();
hb2->add_child(retry); hb2->add_child(retry);
hb2->add_child(install); hb2->add_child(install);