Further adjustments to error clearing logic.

This commit is contained in:
Steven Smith 2016-04-12 22:13:34 -07:00
parent f69a78c867
commit e1cab80c4a

View File

@ -88,6 +88,7 @@ static void networkinstall_close_client(network_install_data* data) {
data->currTotal = 0;
data->installCancelEvent = 0;
memset(&data->installResult, 0, sizeof(data->installResult));
}
static void networkinstall_install_update(ui_view* view, void* data, float* progress, char* progressText) {
@ -105,8 +106,6 @@ static void networkinstall_install_update(ui_view* view, void* data, float* prog
if(!networkInstallData->installStarted || networkInstallData->installResult.finished) {
if(networkInstallData->installResult.finished) {
if(networkInstallData->installResult.failed) {
networkinstall_close_client(networkInstallData);
ui_pop();
progressbar_destroy(view);
@ -120,6 +119,8 @@ static void networkinstall_install_update(ui_view* view, void* data, float* prog
error_display_res(NULL, NULL, networkInstallData->installResult.result, "Failed to install CIA file.");
}
networkinstall_close_client(networkInstallData);
return;
}
@ -140,8 +141,6 @@ static void networkinstall_install_update(ui_view* view, void* data, float* prog
networkInstallData->currProcessed = 0;
networkInstallData->currTotal = 0;
memset(&networkInstallData->installResult, 0, sizeof(networkInstallData->installResult));
u8 ack = 1;
if(sendwait(networkInstallData->clientSocket, &ack, sizeof(ack), 0) < 0) {
networkinstall_close_client(networkInstallData);