fixed crash when removing last item from playlist

m1lhaus · Aug 20, 2016 · 96e2cc1 · 96e2cc1
1 parent e3ee141
commit 96e2cc1
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/components/media.py b/components/media.py
@@ -231,12 +231,15 @@ def removeItem(self, remove_index):
         if must_change_song:
             logger.debug("Currently playing media has been removed from playlist, selecting next one.")
             if not self.shuffled_playlist:
-                logger.debug("There is no other media left!")
-                return
-
-            self.play(item_playlist_id=self.shuffled_playlist[self.shuffled_playlist_current_index])
-            if not restore_playing:
+                logger.debug("There is no next media left!")
+            elif self.shuffled_playlist_current_index >= len(self.shuffled_playlist):
+                self.shuffled_playlist_current_index -= 1
+                self.play(item_playlist_id=self.shuffled_playlist[self.shuffled_playlist_current_index])
                 self.stop()
+            else:
+                self.play(item_playlist_id=self.shuffled_playlist[self.shuffled_playlist_current_index])
+                if not restore_playing:
+                    self.stop()
 
         elif rem_idx_in_shuffled_playlist < self.shuffled_playlist_current_index:
             self.shuffled_playlist_current_index -= 1