[vlc-commits] macosx: Do not resume playback if start, stop or run-time is set

[David Fuhrmann]

vlc/vlc-2.2 | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Sat Aug 16 13:20:55 2014 +0200| [5178b240f63be256e20e8ee23f1358f752207761] | committer: Felix Paul Kühne

macosx: Do not resume playback if start, stop or run-time is set

(cherry picked from commit ad30beeabe8228616b3cd92b88e07f8165f28c0d)
Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=5178b240f63be256e20e8ee23f1358f752207761
---

 modules/gui/macosx/playlist.m |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index b41ef77..09ddb9d 100644
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -1485,12 +1485,11 @@
         if (!p_item)
             return;
 
-        /* allow the user to over-write the start-time */
-        if (p_item->i_options > 0) {
-            for (int x = 0; x < p_item->i_options; x++) {
-                if (strstr(p_item->ppsz_options[x],"start-time"))
-                    return;
-            }
+        /* allow the user to over-write the start/stop/run-time */
+        if (var_GetFloat(p_input_thread, "run-time") > 0 ||
+            var_GetFloat(p_input_thread, "start-time") > 0 ||
+            var_GetFloat(p_input_thread, "stop-time") > 0) {
+            return;
         }
 
         char *psz_url = decode_URI(input_item_GetURI(p_item));