If restore_play_state is active (#828)

* If restore_play_state is active
* won't start with an empty queue
* won't select the last played song in a playlist with more than 500 tracks

xl/main.py

@@ -776,7 +776,7 @@ def __init(self):
             )
 
             if self.gui:
-                self.gui.get_playlist_container().show_current_track()
+                GLib.idle_add(self.gui.get_playlist_container().show_current_track)
 
         # pylint: enable-msg=W0201
 

xlgui/playlist_container.py

@@ -332,8 +332,9 @@ def show_current_track(self):
                 continue
 
             self.set_current_page(n)
-            page.view.scroll_to_cell(page.playlist.current_position)
-            page.view.set_cursor(page.playlist.current_position)
+            if page.playlist.current_position > -1:
+                page.view.scroll_to_cell(page.playlist.current_position)
+                page.view.set_cursor(page.playlist.current_position)
             return True
 
     def on_page_added(self, notebook, child, page_number):

xlgui/widgets/playlist.py

@@ -1177,12 +1177,23 @@ def _refresh_columns(self):
 
     def _setup_models(self):
         self.model = PlaylistModel(self.playlist, [], self.player, self)
-        self.model.connect('row-inserted', self.on_row_inserted)
+        self.__setup_model_hook = self.model.connect(
+            'data-loading', self._on_after_model_loading
+        )
 
         self.modelfilter = self.model.filter_new()
         self.modelfilter.set_visible_func(self._modelfilter_visible_func)
         self.set_model(self.modelfilter)
 
+    def _on_after_model_loading(self, ar1, now_loading):
+        """
+        This is necessary to ensure that row-insert is connected after the initial loading
+        due to threaded PlaylistModel::_load_data_thread and playlists greater than 500 tracks
+        """
+        if not now_loading:
+            self.model.connect('row-inserted', self.on_row_inserted)
+            self.model.disconnect(self.__setup_model_hook)
+
     def _modelfilter_visible_func(self, model, iter, data):
         if self._filter_matcher is not None:
             track = model.get_value(iter, 0)