Merge branch 'main' into feature/new-playlist-btn

ui/controller/controller.go

@@ -2,6 +2,7 @@ package controller
 
 import (
 	"archive/zip"
+	"errors"
 	"fmt"
 	"image"
 	"image/color"
@@ -309,7 +310,6 @@ func (c *Controller) ShowAboutDialog() {
 }
 
 func (c *Controller) ShowSettingsDialog(themeUpdateCallbk func(), themeFiles map[string]string) {
-
 	devs, err := c.App.LocalPlayer.ListAudioDevices()
 	if err != nil {
 		log.Printf("error listing audio devices: %v", err)
@@ -358,7 +358,6 @@ func (c *Controller) ShowSettingsDialog(themeUpdateCallbk func(), themeFiles map
 	c.ClosePopUpOnEscape(pop)
 	c.haveModal = true
 	pop.Show()
-
 }
 
 func (c *Controller) doModalClosed() {
@@ -467,7 +466,6 @@ func (c *Controller) ShowDownloadDialog(tracks []*mediaprovider.Track, downloadN
 			} else {
 				go c.downloadTracks(tracks, file.URI().Path(), downloadName)
 			}
-
 		},
 		c.MainWindow)
 	dg.SetFileName(fileName)
@@ -549,7 +547,7 @@ func (c *Controller) sendNotification(title, content string) {
 
 func (c *Controller) showError(content string) {
 	// TODO: display an in-app toast message instead of a dialog.
-	dialog.ShowError(fmt.Errorf(content), c.MainWindow)
+	dialog.ShowError(errors.New(content), c.MainWindow)
 }
 
 func (c *Controller) ShowAlbumInfoDialog(albumID, albumName string, albumCover image.Image) {

ui/controller/playlist.go

@@ -88,7 +88,6 @@ func (m *Controller) DoAddTracksToPlaylistWorkflow(trackIDs []string) {
 				}()
 			}
 		}
-
 	})
 	m.ClosePopUpOnEscape(pop)
 	m.haveModal = true

ui/controller/routes.go

@@ -81,6 +81,7 @@ func GenresRoute() Route {
 func PlaylistRoute(id string) Route {
 	return Route{Page: Playlist, Arg: id}
 }
+
 func PlaylistsRoute() Route {
 	return Route{Page: Playlists}
 }

ui/controller/serverconnection.go

@@ -200,7 +200,6 @@ func (m *Controller) PromptForLoginAndConnect() {
 					pop.Show()
 				}
 			}, m.MainWindow)
-
 	}
 	m.haveModal = true
 	pop.Show()