diff options
author | waker <wakeroid@gmail.com> | 2009-08-27 20:40:06 +0200 |
---|---|---|
committer | waker <wakeroid@gmail.com> | 2009-08-27 20:40:06 +0200 |
commit | 8c9425b1b18bc8f76f9fad25d56bd4d3466fe1e3 (patch) | |
tree | ac42850f2d5b2d4fcda3743089583e94499c4a32 /main.c | |
parent | 931baf241fff9b61010076da7f183db983db11f6 (diff) | |
parent | f66ceea04ef9a373398f0416130b300629405952 (diff) |
Merge branch 'master' into plugins
Conflicts:
playlist.c
Diffstat (limited to 'main.c')
-rw-r--r-- | main.c | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -358,12 +358,8 @@ player_thread (uintptr_t ctx) { GDK_THREADS_LEAVE(); break; case M_STOPSONG: - p_stop (); - GDK_THREADS_ENTER(); - if (playlist_current_ptr) { - gtkpl_redraw_pl_row (&main_playlist, pl_get_idx_of (playlist_current_ptr), playlist_current_ptr); - } - GDK_THREADS_LEAVE(); + //p_stop (); + streamer_set_nextsong (-2, 0); break; case M_NEXTSONG: GDK_THREADS_ENTER(); @@ -627,6 +623,7 @@ main (int argc, char *argv[]) { gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, w)), TRUE); w = loopingwidgets[session_get_playlist_looping ()]; gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, w)), TRUE); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "cursor_follows_playback")), session_get_cursor_follows_playback () ? TRUE : FALSE); searchwin = create_searchwin (); gtk_window_set_transient_for (GTK_WINDOW (searchwin), GTK_WINDOW (mainwin)); |