Ensured closing of API on close

Added a string null check in API requestor
KieranBond · Jan 24, 2020 · 24e2ae5 · 24e2ae5
1 parent 48dd476
commit 24e2ae5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/MiniSpotify/MiniSpotify/Source/APIRequestor.cs b/MiniSpotify/MiniSpotify/Source/APIRequestor.cs
@@ -280,7 +280,7 @@ public bool SkipSongPlayback(bool a_nextSong = true)
 
         public string GetSongArtwork(string a_trackID)
         {
-            if (m_spotifyWebAPI != null)
+            if (m_spotifyWebAPI != null && !string.IsNullOrEmpty(a_trackID))
             {
                 return m_spotifyWebAPI.GetTrack(a_trackID).Album.Images[0].Url;
             }

diff --git a/MiniSpotify/MiniSpotify/Source/MainWindow.xaml.cs b/MiniSpotify/MiniSpotify/Source/MainWindow.xaml.cs
@@ -37,6 +37,8 @@ public MainWindow()
             APIRequestor.Instance.m_onAPIPolled += UpdateUI;
 
             LocationChanged += UpdateEditWindowPosition;
+
+            Closing += (e, f) => APIRequestor.Instance.Close();
         }
 
         public void UpdateUI(FullTrack a_latestTrack = null)