fix #227

Author: theweavr

BreadPlayer.Views.UWP/ViewModels/ShellViewModel.cs

@@ -547,7 +547,7 @@ private void SetNowPlayingSong()
             }
         }
 
-        public async Task<Mediafile> GetUpcomingSong(bool isNext = false)
+        public async Task<Mediafile> GetUpcomingSong(bool isNext = false, bool raiseException = true)
         {
             var playingCollection = GetPlayingCollection();
             NowPlayingQueue = playingCollection;
@@ -579,7 +579,7 @@ public async Task<Mediafile> GetUpcomingSong(bool isNext = false)
                     }
                     else
                     {
-                        if (playingCollection[_indexOfCurrentlyPlayingFile + 1] != null)
+                        if (playingCollection.Count <= _indexOfCurrentlyPlayingFile + 1)
                         {
                             toPlayFile = _indexOfCurrentlyPlayingFile <= playingCollection.Count - 2 && _indexOfCurrentlyPlayingFile != -1
                                         ? playingCollection[_indexOfCurrentlyPlayingFile + 1]
@@ -592,10 +592,13 @@ public async Task<Mediafile> GetUpcomingSong(bool isNext = false)
                 }
                 catch (Exception ex)
                 {
-                    BLogger.E(string.Format("An error occured while trying to play next song. IsShuffle: {0} IsSourceGrouped: {1}", Shuffle, IsSourceGrouped), ex);
-                    await SharedLogic.Instance.NotificationManager.ShowMessageAsync("An error occured while trying to play next song. Trying again...");
-                    ClearPlayerState();
-                    PlayNext();
+                    if (raiseException)
+                    {
+                        BLogger.E(string.Format("An error occured while trying to play next song. IsShuffle: {0} IsSourceGrouped: {1}", Shuffle, IsSourceGrouped), ex);
+                        await SharedLogic.Instance.NotificationManager.ShowMessageAsync("An error occured while trying to play next song. Trying again...");
+                        ClearPlayerState();
+                        PlayNext();
+                    }
                 }
             }
             return null;
@@ -1168,9 +1171,6 @@ public async Task Load(Mediafile mp3File, bool play = false, double currentPos =
             else
             {
                 BLogger.I("Failed to load file. Loading next file...");
-                var playingCollection = GetPlayingCollection();
-                int indexoferrorfile = playingCollection.IndexOf(playingCollection.FirstOrDefault(t => t.Path == mp3File.Path));
-                UpdateCurrentlyPlayingSongIndex();
                 await Load(await GetUpcomingSong(true), true);
             }