From 88ddef629918987fbd5f81bc0dbba7601aff9375 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Thu, 30 Jan 2025 22:56:59 -0300 Subject: [PATCH] fyne.Do in notification toast --- ui/controller/controller.go | 22 +++++++++++++--------- ui/toastoverlay.go | 2 +- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ui/controller/controller.go b/ui/controller/controller.go index 9b1bee71..695ab0a5 100644 --- a/ui/controller/controller.go +++ b/ui/controller/controller.go @@ -307,14 +307,18 @@ func (m *Controller) DoAddTracksToPlaylistWorkflow(trackIDs []string) { }) sp.SetOnNavigateTo(func(contentType mediaprovider.ContentType, id string) { notifySuccess := func(n int) { - msg := lang.LocalizePluralKey("playlist.addedtracks", - "Added tracks to playlist", n, map[string]string{"trackCount": strconv.Itoa(n)}) - m.ToastProvider.ShowSuccessToast(msg) + fyne.Do(func() { + msg := lang.LocalizePluralKey("playlist.addedtracks", + "Added tracks to playlist", n, map[string]string{"trackCount": strconv.Itoa(n)}) + m.ToastProvider.ShowSuccessToast(msg) + }) } notifyError := func() { - m.ToastProvider.ShowErrorToast( - lang.L("An error occurred adding tracks to the playlist"), - ) + fyne.Do(func() { + m.ToastProvider.ShowErrorToast( + lang.L("An error occurred adding tracks to the playlist"), + ) + }) } pop.Hide() m.App.Config.Application.AddToPlaylistSkipDuplicates = sp.SkipDuplicates @@ -324,7 +328,7 @@ func (m *Controller) DoAddTracksToPlaylistWorkflow(trackIDs []string) { if err == nil { notifySuccess(len(trackIDs)) } else { - log.Println("error adding tracks to playlist: %s", err.Error()) + log.Printf("error adding tracks to playlist: %s", err.Error()) notifyError() } }() @@ -348,7 +352,7 @@ func (m *Controller) DoAddTracksToPlaylistWorkflow(trackIDs []string) { if err == nil { notifySuccess(len(filterTrackIDs)) } else { - log.Println("error adding tracks to playlist: %s", err.Error()) + log.Printf("error adding tracks to playlist: %s", err.Error()) notifyError() } } @@ -359,7 +363,7 @@ func (m *Controller) DoAddTracksToPlaylistWorkflow(trackIDs []string) { if err == nil { notifySuccess(len(trackIDs)) } else { - log.Println("error adding tracks to playlist: %s", err.Error()) + log.Printf("error adding tracks to playlist: %s", err.Error()) notifyError() } }() diff --git a/ui/toastoverlay.go b/ui/toastoverlay.go index d4801901..b71235e7 100644 --- a/ui/toastoverlay.go +++ b/ui/toastoverlay.go @@ -72,7 +72,7 @@ func (t *ToastOverlay) showToast(isErr bool, message string) { case <-ctx.Done(): return default: - t.dismissToast() + fyne.Do(t.dismissToast) } }() }