diff -u -r1.77 mainwin.c
--- beep/mainwin.c	1 May 2004 23:42:38 -0000	1.77
+++ beep/mainwin.c	3 May 2004 12:08:33 -0000
@@ -107,7 +107,7 @@
 
 enum {
     MAINWIN_OPT_PREFS, MAINWIN_OPT_SKIN, MAINWIN_OPT_RELOADSKIN,
-    MAINWIN_OPT_REPEAT, MAINWIN_OPT_SHUFFLE,
+    MAINWIN_OPT_REPEAT, MAINWIN_OPT_SHUFFLE, MAINWIN_OPT_NPA,
     MAINWIN_OPT_TELAPSED, MAINWIN_OPT_TREMAINING, MAINWIN_OPT_ALWAYS,
     MAINWIN_OPT_STICKY, MAINWIN_OPT_WS, MAINWIN_OPT_PWS,
     MAINWIN_OPT_EQWS, MAINWIN_OPT_DOUBLESIZE, MAINWIN_OPT_EASY_MOVE
@@ -352,6 +352,8 @@
      "<ToggleItem>"},
     {N_("/Shuffle"), "S", mainwin_options_menu_callback,
      MAINWIN_OPT_SHUFFLE, "<ToggleItem>"},
+    {N_("/No Playlist Advance"), "<control>N", mainwin_options_menu_callback,
+     MAINWIN_OPT_NPA, "<ToggleItem>"},
     {"/-", NULL, NULL, 0, "<Separator>"},
     {N_("/Time Elapsed"), "<control>E", mainwin_options_menu_callback,
      MAINWIN_OPT_TELAPSED, "<RadioItem>"},
@@ -2265,6 +2267,11 @@
             GTK_CHECK_MENU_ITEM(gtk_item_factory_get_widget
                                 (mainwin_options_menu, "/Easy Move"))->active;
         break;
+    case MAINWIN_OPT_NPA:
+        cfg.no_playlist_advance =
+            GTK_CHECK_MENU_ITEM(gtk_item_factory_get_widget
+                      (mainwin_options_menu, "/No Playlist Advance"))->active;
+        break;
     }
 }
 
@@ -2735,6 +2742,7 @@
                                   mainwin_options_menu_entries, NULL);
     CHECK_SET(mainwin_options_menu, "/Shuffle", cfg.shuffle);
     CHECK_SET(mainwin_options_menu, "/Repeat", cfg.repeat);
+    CHECK_SET(mainwin_options_menu, "/No Playlist Advance", cfg.no_playlist_advance);
     CHECK_SET(mainwin_options_menu, "/Easy Move", cfg.easy_move);
 
     if (cfg.timer_mode == TIMER_ELAPSED)