Fixed crash on adverts, Closes #34

Author: Johnny Dellinger @PC

SpotifyAPI.Example/LocalControl.Designer.cs

@@ -78,6 +78,12 @@ public async void UpdateTrack(Track track)
         {
             _currentTrack = track;
 
+            advertLabel.Text = track.IsAd() ? "ADVERT" : "";
+            timeProgressBar.Maximum = track.Length;
+
+            if (track.IsAd())
+                return; //Don't process further, maybe null values
+
             titleLinkLabel.Text = track.TrackResource.Name;
             titleLinkLabel.Tag = track.TrackResource.Uri;
 
@@ -87,8 +93,6 @@ public async void UpdateTrack(Track track)
             albumLinkLabel.Text = track.AlbumResource.Name;
             albumLinkLabel.Tag = track.AlbumResource.Uri;
 
-            timeProgressBar.Maximum = track.Length;
-
             bigAlbumPicture.Image = await track.GetAlbumArtAsync(AlbumArtSize.Size640);
             smallAlbumPicture.Image = await track.GetAlbumArtAsync(AlbumArtSize.Size160);
         }

SpotifyAPI.Example/LocalControl.cs

@@ -21,6 +21,15 @@ public class Track
         [JsonProperty("track_type")]
         public string TrackType { get; set; }
 
+        /// <summary>
+        /// Checks if the track is an advert
+        /// </summary>
+        /// <returns>true if the track is an advert, fals otherwise</returns>
+        public bool IsAd()
+        {
+            return TrackType == "ad";
+        }
+
         /// <summary>
         /// Returns a URL to the album cover in the provided size
         /// </summary>

SpotifyAPI/Local/Models/Track.cs

@@ -95,33 +95,33 @@ private void ElapsedTick(object sender, ElapsedEventArgs e)
             }
             if (newStatusResponse.Track != null && _eventStatusResponse.Track != null)
             {
-                if (newStatusResponse.Track.TrackResource.Name != _eventStatusResponse.Track.TrackResource.Name && OnTrackChange != null)
+                if (newStatusResponse.Track.TrackResource?.Name != _eventStatusResponse.Track.TrackResource?.Name)
                 {
-                    OnTrackChange(new TrackChangeEventArgs()
+                    OnTrackChange?.Invoke(new TrackChangeEventArgs()
                     {
                         OldTrack = _eventStatusResponse.Track,
                         NewTrack = newStatusResponse.Track
                     });
                 }
             }
-            if (newStatusResponse.Playing != _eventStatusResponse.Playing && OnPlayStateChange != null)
+            if (newStatusResponse.Playing != _eventStatusResponse.Playing)
             {
-                OnPlayStateChange(new PlayStateEventArgs()
+                OnPlayStateChange?.Invoke(new PlayStateEventArgs()
                 {
                     Playing = newStatusResponse.Playing
                 });
             }
-            if (newStatusResponse.Volume != _eventStatusResponse.Volume && OnVolumeChange != null)
+            if (newStatusResponse.Volume != _eventStatusResponse.Volume)
             {
-                OnVolumeChange(new VolumeChangeEventArgs()
+                OnVolumeChange?.Invoke(new VolumeChangeEventArgs()
                 {
                     OldVolume = _eventStatusResponse.Volume,
                     NewVolume = newStatusResponse.Volume
                 });
             }
-            if (newStatusResponse.PlayingPosition != _eventStatusResponse.PlayingPosition && OnTrackTimeChange != null)
+            if (newStatusResponse.PlayingPosition != _eventStatusResponse.PlayingPosition)
             {
-                OnTrackTimeChange(new TrackTimeChangeEventArgs()
+                OnTrackTimeChange?.Invoke(new TrackTimeChangeEventArgs()
                 {
                     TrackTime = newStatusResponse.PlayingPosition
                 });