Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #2021 from ronie/confluence-subs

[Confluence] Don't process subsequent onclicks if the first one was cancelled
  • Loading branch information...
commit fbfe5ee6a4471ab3d0995c16216fec82b35b02a3 2 parents fdf4686 + 0b47b96
Martijn Kaijser MartijnKaijser authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 addons/skin.confluence/720p/VideoOSD.xml
4 addons/skin.confluence/720p/VideoOSD.xml
View
@@ -313,8 +313,8 @@
<onclick>Close</onclick>
<onclick>XBMC.RunScript($INFO[Skin.String(SubtitleScript_Path)])</onclick>
<altclick>Skin.SetAddon(SubtitleScript_Path,xbmc.python.subtitles)</altclick>
- <altclick>Close</altclick>
- <altclick>XBMC.RunScript($INFO[Skin.String(SubtitleScript_Path)])</altclick>
+ <altclick condition="Window.IsVisible(VideoOSD)">Dialog.Close(VideoOSD)</altclick>
+ <altclick condition="!IsEmpty(Skin.String(SubtitleScript_Path))">XBMC.RunScript($INFO[Skin.String(SubtitleScript_Path)])</altclick>
<usealttexture>IsEmpty(Skin.String(SubtitleScript_Path))</usealttexture>
</control>
<control type="button" id="251">
Please sign in to comment.
Something went wrong with that request. Please try again.