[vlc-commits] input: ignore start-paused in non-interactive inputs

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat May 23 21:34:31 2015 +0300| [7e68d2bf537c99b56c59fbd97fcb2636e4de2822] | committer: Rémi Denis-Courmont

input: ignore start-paused in non-interactive inputs

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7e68d2bf537c99b56c59fbd97fcb2636e4de2822
---

 src/input/input.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/input/input.c b/src/input/input.c
index 61bb3a4..2420df6 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -524,12 +524,6 @@ static void *Run( void *obj )
 
     if( !Init( p_input ) )
     {
-        if( var_InheritBool( p_input, "start-paused" ) )
-        {
-            const mtime_t i_control_date = mdate();
-            ControlPause( p_input, i_control_date );
-        }
-
         MainLoop( p_input, true ); /* FIXME it can be wrong (like with VLM) */
 
         /* Clean up */
@@ -685,6 +679,10 @@ static void MainLoop( input_thread_t *p_input, bool b_interactive )
     mtime_t i_start_mdate = mdate();
     mtime_t i_intf_update = 0;
     mtime_t i_last_seek_mdate = 0;
+
+    if( b_interactive && var_InheritBool( p_input, "start-paused" ) )
+        ControlPause( p_input, i_start_mdate );
+
     bool b_pause_after_eof = b_interactive &&
                              var_CreateGetBool( p_input, "play-and-pause" );