From 419b2f5a7917d7a584ab9d40a71e7261de801b97 Mon Sep 17 00:00:00 2001 From: Arsen Musayelyan Date: Fri, 27 Aug 2021 09:01:46 -0700 Subject: [PATCH] Break transfer loops after refreshing progress bar --- cmd/itctl/cmd/upgrade.go | 8 ++++---- cmd/itgui/upgrade.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/itctl/cmd/upgrade.go b/cmd/itctl/cmd/upgrade.go index 6521fc9..df854c7 100644 --- a/cmd/itctl/cmd/upgrade.go +++ b/cmd/itctl/cmd/upgrade.go @@ -95,14 +95,14 @@ var upgradeCmd = &cobra.Command{ if err != nil { log.Fatal().Err(err).Msg("Error decoding response data") } - // If transfer finished, break - if event.Received == event.Total { - break - } // Set total bytes in progress bar bar.SetTotal(event.Total) // Set amount of bytes received in progress bar bar.SetCurrent(event.Received) + // If transfer finished, break + if event.Received == event.Total { + break + } } // Finish progress bar bar.Finish() diff --git a/cmd/itgui/upgrade.go b/cmd/itgui/upgrade.go index 24e7e61..168cfb7 100644 --- a/cmd/itgui/upgrade.go +++ b/cmd/itgui/upgrade.go @@ -164,10 +164,6 @@ func upgradeTab(parent fyne.Window) *fyne.Container { guiErr(err, "Error decoding response value", false, parent) return } - // If transfer finished, break - if event.Received == event.Total { - break - } // Set label text to received / total B progressLbl.SetText(fmt.Sprintf("%d / %d B", event.Received, event.Total)) // Set progress bar values @@ -175,6 +171,10 @@ func upgradeTab(parent fyne.Window) *fyne.Container { progressBar.Value = float64(event.Received) // Refresh progress bar progressBar.Refresh() + // If transfer finished, break + if event.Received == event.Total { + break + } } })