fyne.Do in notification toast

dweymouth · Jan 31, 2025 · 88ddef6 · 88ddef6
1 parent 538e201
commit 88ddef6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git 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
@@ -72,7 +72,7 @@ func (t *ToastOverlay) showToast(isErr bool, message string) {
 		case <-ctx.Done():
 			return
 		default:
-			t.dismissToast()
+			fyne.Do(t.dismissToast)
 		}
 	}()
 }