summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Constantino <wiiaboo@gmail.com>2017-03-27 17:46:11 +0100
committerRicardo Constantino <wiiaboo@gmail.com>2017-03-27 18:00:56 +0100
commit07ee7fb2c3495dac114e0028f8e2a8b1ae726add (patch)
tree84e94a1535959e69b08e2f5c6f34efd7019cd09f
parentdc00ad537f74dc6010afdc5c4f03a32a8bf2793a (diff)
downloadmpv-07ee7fb2c3495dac114e0028f8e2a8b1ae726add.tar.bz2
mpv-07ee7fb2c3495dac114e0028f8e2a8b1ae726add.tar.xz
osc: escape ASS and strip newlines on title
-rw-r--r--DOCS/man/osc.rst1
-rw-r--r--player/lua/osc.lua2
2 files changed, 3 insertions, 0 deletions
diff --git a/DOCS/man/osc.rst b/DOCS/man/osc.rst
index 17911bbf68..56335229fd 100644
--- a/DOCS/man/osc.rst
+++ b/DOCS/man/osc.rst
@@ -244,6 +244,7 @@ Configurable Options
String that supports property expansion that will be displayed as
OSC title.
+ ASS tags are escaped, and newlines and trailing slashes are stripped.
``tooltipborder``
Default: 1
diff --git a/player/lua/osc.lua b/player/lua/osc.lua
index 569bb208ac..ff2d166897 100644
--- a/player/lua/osc.lua
+++ b/player/lua/osc.lua
@@ -1514,6 +1514,8 @@ function osc_init()
ne.content = function ()
local title = mp.command_native({"expand-text", user_opts.title})
+ -- escape ASS, and strip newlines and trailing slashes
+ title = title:gsub("\\n", " "):gsub("\\$", ""):gsub("{","\\{")
return not (title == "") and title or "mpv"
end