summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-04-22 18:52:55 +0200
committerwm4 <wm4@nowhere>2015-04-22 18:52:55 +0200
commit589533d97ad0bf861a555b7402410297541bf96c (patch)
tree6c4a5d738d193c7537e69ffa9d60c8e146d5c093 /player
parent777273c064f2a65f2aef2aaf96f10cfe74d84d83 (diff)
downloadmpv-589533d97ad0bf861a555b7402410297541bf96c.tar.bz2
mpv-589533d97ad0bf861a555b7402410297541bf96c.tar.xz
osc: paint over a crash
Sometimes tries to index a nil object when seeking close to the end of the file. See #1101.
Diffstat (limited to 'player')
-rw-r--r--player/lua/osc.lua10
1 files changed, 6 insertions, 4 deletions
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