Skip to content

Commit

Permalink
Merge pull request #46105 from Calinou/assetlib-retry-button-only-fai…
Browse files Browse the repository at this point in the history
…lure

Only display the assetlib Retry button if the download failed
  • Loading branch information
akien-mga authored Feb 17, 2021
2 parents 1d14c22 + 508011a commit 7f63d6e
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion editor/plugins/asset_library_editor_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ void EditorAssetLibraryItemDownload::_http_download_completed(int p_status, int
if (sha256 != download_sha256) {
error_text = TTR("Bad download hash, assuming file has been tampered with.") + "\n";
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;
Expand All @@ -359,6 +359,8 @@ void EditorAssetLibraryItemDownload::_http_download_completed(int p_status, int
if (error_text != String()) {
download_error->set_text(TTR("Asset Download Error:") + "\n" + error_text);
download_error->popup_centered();
// Let the user retry the download.
retry->show();
return;
}

Expand Down Expand Up @@ -459,6 +461,9 @@ void EditorAssetLibraryItemDownload::_install() {
}

void EditorAssetLibraryItemDownload::_make_request() {
// Hide the Retry button if we've just pressed it.
retry->hide();

download->cancel_request();
download->set_download_file(EditorSettings::get_singleton()->get_cache_dir().plus_file("tmp_asset_" + itos(asset_id)) + ".zip");

Expand Down Expand Up @@ -516,6 +521,8 @@ EditorAssetLibraryItemDownload::EditorAssetLibraryItemDownload() {
retry = memnew(Button);
retry->set_text(TTR("Retry"));
retry->connect("pressed", callable_mp(this, &EditorAssetLibraryItemDownload::_make_request));
// Only show the Retry button in case of a failure.
retry->hide();

hb2->add_child(retry);
hb2->add_child(install);
Expand Down

0 comments on commit 7f63d6e

Please sign in to comment.