[rhythmbox] shell: restore original jump-to-playing behaviour with queue in side pane

[Jonathan Matthew <jmatthew src gnome org>]

commit 71ea44b9abd14952276a3c788cdf1bdc08b60e41
Author: wiegner at gmx.de <wiegner gmx de>
Date:   Mon Aug 18 09:06:57 2014 +1000

    shell: restore original jump-to-playing behaviour with queue in side pane
    
    https://bugzilla.gnome.org/show_bug.cgi?id=729373 again

 shell/rb-shell.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/shell/rb-shell.c b/shell/rb-shell.c
index b3ea9b5..77526d9 100644
--- a/shell/rb-shell.c
+++ b/shell/rb-shell.c
@@ -2648,20 +2648,20 @@ rb_shell_jump_to_current (RBShell *shell, gboolean select_page)
        RhythmDBEntry *entry;
        RBEntryView *songs;
 
-       source = rb_shell_player_get_playing_source (shell->priv->player_shell);
+       if (g_settings_get_boolean (shell->priv->settings, "queue-as-sidebar")) {
+               source = rb_shell_player_get_active_source (shell->priv->player_shell);
+       } else {
+               source = rb_shell_player_get_playing_source (shell->priv->player_shell);
+       }
+
        if (source == NULL)
                return;
 
-       if (source == RB_SOURCE (shell->priv->queue_source) &&
-           g_settings_get_boolean (shell->priv->settings, "queue-as-sidebar")) {
-               gtk_widget_grab_focus (shell->priv->queue_sidebar);
-               songs = RB_ENTRY_VIEW (shell->priv->queue_sidebar);
-       } else {
-               if (select_page) {
-                       rb_shell_select_page (shell, RB_DISPLAY_PAGE (source));
-               }
-               songs = rb_source_get_entry_view (source);
+
+       if (select_page) {
+               rb_shell_select_page (shell, RB_DISPLAY_PAGE (source));
        }
+       songs = rb_source_get_entry_view (source);
 
        if (songs != NULL) {
                entry = rb_shell_player_get_playing_entry (shell->priv->player_shell);