From 589533d97ad0bf861a555b7402410297541bf96c Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 22 Apr 2015 18:52:55 +0200
Subject: osc: paint over a crash

Sometimes tries to index a nil object when seeking close to the end of
the file. See #1101.
---
 player/lua/osc.lua | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'player/lua/osc.lua')

diff --git a/player/lua/osc.lua b/player/lua/osc.lua
index 26e2f89c5f..082dae599f 100644
--- a/player/lua/osc.lua
+++ b/player/lua/osc.lua
@@ -266,11 +266,13 @@ end
 -- get the currently selected track of <type>, OSC-style counted
 function get_track(type)
     local track = mp.get_property(type)
-    if (track == "no" or track == nil) then
-        return 0
-    else
-        return tracks_mpv[type][tonumber(track)].osc_id
+    if track ~= "no" and track ~= nil then
+        local tr = tracks_mpv[type][tonumber(track)]
+        if tr then
+            return tr.osc_id
+        end
     end
+    return 0
 end
 
 
-- 
cgit v1.2.3


From df1f22214baadd2cc15b4cd24ebd400b6095b5c0 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 23 Apr 2015 22:08:07 +0200
Subject: osc: add nil check for element.eventresponder

Possibly fixes a crash (see #1101).
---
 player/lua/osc.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'player/lua/osc.lua')

diff --git a/player/lua/osc.lua b/player/lua/osc.lua
index 082dae599f..7f602b8689 100644
--- a/player/lua/osc.lua
+++ b/player/lua/osc.lua
@@ -448,7 +448,7 @@ function render_elements(master_ass)
         style_ass:append(string.format("{\\1a&H%X&\\2a&H%X&\\3a&H%X&\\4a&H%X&}",
             ar[1], ar[2], ar[3], ar[4]))
 
-        if (state.active_element == n) then
+        if element.eventresponder and (state.active_element == n) then
 
             -- run render event functions
             if not (element.eventresponder.render == nil) then
-- 
cgit v1.2.3