playlist: do not create play-and-stop variable

This was not needed (but it prevented the preferences from taking effects
until VLC was restarted).

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index a80c3ef6b1679d72173add20e31961d614d6ae2a..0873a976ecaf30c8a31b336f735a7c0a4209f9ff 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -483,7 +483,6 @@ static void VariablesInit( playlist_t *p_playlist )
 
     /* Variables to control playback */
     var_Create( p_playlist, "playlist-autostart", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-    var_Create( p_playlist, "play-and-stop", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
     var_Create( p_playlist, "play-and-exit", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
     var_Create( p_playlist, "random", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
     var_AddCallback( p_playlist, "random", RandomCallback, NULL );

diff --git a/src/playlist/thread.c b/src/playlist/thread.c
index 08d9feb40476a07f3949a35a9f9db7584abf20ce..e86362f42a61d4632df9b710c806478c5179fb99 100644 (file)
--- a/src/playlist/thread.c
+++ b/src/playlist/thread.c
@@ -372,7 +372,7 @@ static playlist_item_t *NextItem( playlist_t *p_playlist )
     {
         bool b_loop = var_GetBool( p_playlist, "loop" );
         bool b_repeat = var_GetBool( p_playlist, "repeat" );
-        bool b_playstop = var_GetBool( p_playlist, "play-and-stop" );
+        bool b_playstop = var_InheritBool( p_playlist, "play-and-stop" );
 
         /* Repeat and play/stop */
         if( b_repeat && get_current_status_item( p_playlist ) )