From: ronie <ronie@poedel.net>
Date: Thu, 3 Jan 2013 13:15:12 +0000 (+0100)
Subject: [Confluence] Don't process subsequent onclicks if the first one was cancelled. Fixes... 
X-Git-Tag: Gotham_alpha1~188^2
X-Git-Url: http://code.vuplus.com/gitweb/?a=commitdiff_plain;h=0b47b966c51c2492153845b85478999c6829a494;p=vuplus_xbmc

[Confluence] Don't process subsequent onclicks if the first one was cancelled. Fixes #13576
---

diff --git a/addons/skin.confluence/720p/VideoOSD.xml b/addons/skin.confluence/720p/VideoOSD.xml
index b114a5e..ccbceb4 100644
--- a/addons/skin.confluence/720p/VideoOSD.xml
+++ b/addons/skin.confluence/720p/VideoOSD.xml
@@ -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">