Select correct playlist and track if starting with option resume_play…

…back and gui (#825)

xl/main.py

@@ -768,11 +768,16 @@ def __init(self):
             # -> don't do it in command line mode, since that isn't expected
             self.gui.rescan_collection_with_progress(True)
 
-        if restore:
+        restore_play_state = settings.get_option("player/resume_playback", True)
+
+        if restore and restore_play_state:
             player.QUEUE._restore_player_state(
                 os.path.join(xdg.get_data_dir(), 'player.state')
             )
 
+            if self.gui:
+                self.gui.get_playlist_container().show_current_track()
+
         # pylint: enable-msg=W0201
 
     def _set_locale(self, custom_lang: str = None) -> None:

xl/player/queue.py

@@ -344,4 +344,6 @@ def _do_restore_player_state(self, state):
                 "%s/resume_paused" % self.player._name, False
             )
 
-            self.player.play(self.get_current(), start_at=start_at, paused=paused)
+            self.player.play(
+                self.current_playlist.get_current(), start_at=start_at, paused=paused
+            )

xlgui/__init__.py

@@ -347,6 +347,9 @@ def get_panel(self, panel_name):
         """
         return self.panel_notebook.panels[panel_name].panel
 
+    def get_playlist_container(self):
+        return self.main.playlist_container
+
     def quit(self):
         """
         Quits the gui, saving anything that needs to be saved