thomasave
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix incomplete merge

This commit is contained in:
Thomas Avé 2023-05-08 13:39:40 +02:00
parent c39397a19c
commit fab7eb39b5
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mpv/scripts/modern.lua
View File

@ -1145,16 +1145,8 @@ function osc_init()
if (mp.get_property('video') == 'no') then -- dummy/forced window if (mp.get_property('video') == 'no') then -- dummy/forced window
user_opts.visibility = "always" user_opts.visibility = "always"
<<<<<<< HEAD
user_opts.last_visibility = "always" user_opts.last_visibility = "always"
visibility_mode('always', true) visibility_mode('always', true)
=======
<<<<<<< HEAD
=======
user_opts.last_visibility = "always"
visibility_mode('always', true)
>>>>>>> a21cfe5 (Fix OSC when playing audio)
>>>>>>> master
scale = user_opts.scaleforcedwindow scale = user_opts.scaleforcedwindow
elseif state.fullscreen then elseif state.fullscreen then
scale = user_opts.scalefullscreen scale = user_opts.scalefullscreen
@ -1636,19 +1628,9 @@ function pause_state(name, enabled)
visibility_mode('always', true) visibility_mode('always', true)
show_osc() show_osc()
else else
<<<<<<< HEAD
if (mp.get_property('video') ~= 'no') then if (mp.get_property('video') ~= 'no') then
visibility_mode(state.lastvisibility, true) visibility_mode(state.lastvisibility, true)
end end
=======
<<<<<<< HEAD
visibility_mode(state.lastvisibility, true)
=======
if (mp.get_property('video') ~= 'no') then
visibility_mode(state.lastvisibility, true)
end
>>>>>>> a21cfe5 (Fix OSC when playing audio)
>>>>>>> master
end end
end end
request_tick() request_tick()