diff options
Diffstat (limited to 'pkg/gui/controllers/helpers/app_status_helper.go')
-rw-r--r-- | pkg/gui/controllers/helpers/app_status_helper.go | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/pkg/gui/controllers/helpers/app_status_helper.go b/pkg/gui/controllers/helpers/app_status_helper.go index 31bfcca3a..b0d1b3818 100644 --- a/pkg/gui/controllers/helpers/app_status_helper.go +++ b/pkg/gui/controllers/helpers/app_status_helper.go @@ -59,15 +59,10 @@ func (self appStatusHelperTask) Continue() { // withWaitingStatus wraps a function and shows a waiting status while the function is still executing func (self *AppStatusHelper) WithWaitingStatus(message string, f func(gocui.Task) error) { - self.c.OnWorker(func(task gocui.Task) { - err := self.statusMgr().WithWaitingStatus(message, self.renderAppStatus, func(waitingStatusHandle *status.WaitingStatusHandle) error { + self.c.OnWorker(func(task gocui.Task) error { + return self.statusMgr().WithWaitingStatus(message, self.renderAppStatus, func(waitingStatusHandle *status.WaitingStatusHandle) error { return f(appStatusHelperTask{task, waitingStatusHandle}) }) - if err != nil { - self.c.OnUIThread(func() error { - return err - }) - } }) } @@ -91,7 +86,7 @@ func (self *AppStatusHelper) GetStatusString() string { } func (self *AppStatusHelper) renderAppStatus() { - self.c.OnWorker(func(_ gocui.Task) { + self.c.OnWorker(func(_ gocui.Task) error { ticker := time.NewTicker(time.Millisecond * time.Duration(self.c.UserConfig.Gui.Spinner.Rate)) defer ticker.Stop() for range ticker.C { @@ -103,9 +98,10 @@ func (self *AppStatusHelper) renderAppStatus() { }) if appStatus == "" { - return + break } } + return nil }) } |