move err handling
This commit is contained in:
+4
-3
@@ -622,6 +622,9 @@ func (a *App) SavePlayQueueIfEnabled() {
|
|||||||
func (a *App) LoadSavedPlayQueue() error {
|
func (a *App) LoadSavedPlayQueue() error {
|
||||||
queueFilePath := path.Join(a.configDir, savedQueueFile)
|
queueFilePath := path.Join(a.configDir, savedQueueFile)
|
||||||
playQueue, err := LoadPlayQueue(queueFilePath, a.ServerManager, a.Config.Application.SaveQueueToServer)
|
playQueue, err := LoadPlayQueue(queueFilePath, a.ServerManager, a.Config.Application.SaveQueueToServer)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
var unshuffledPlayQueue *SavedPlayQueue
|
var unshuffledPlayQueue *SavedPlayQueue
|
||||||
var shuffledPlayQueue *SavedPlayQueue
|
var shuffledPlayQueue *SavedPlayQueue
|
||||||
@@ -642,9 +645,7 @@ func (a *App) LoadSavedPlayQueue() error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if len(playQueue.Tracks) == 0 {
|
if len(playQueue.Tracks) == 0 {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user