aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmarshallnz <jcmarsha@gmail.com>2014-02-07 15:36:52 +1300
committerjmarshallnz <jcmarsha@gmail.com>2014-02-07 15:36:52 +1300
commita748ec479ab2c251469228520f9f807ba19bfd3f (patch)
tree544267d6921bc1d6c93101f7681d45bc9174dee5
parent2fe31173c60aa75c702a8193d639765fd937f934 (diff)
parent199d2dd4491b44a7bfb2088f09895c9574d2e655 (diff)
Merge pull request #4157 from amet/fix_manual_button
[coreSubs] fix manual search button after 618cff753d20628920bb39d28ec40ba2619745f7
-rw-r--r--xbmc/video/dialogs/GUIDialogSubtitles.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/xbmc/video/dialogs/GUIDialogSubtitles.cpp b/xbmc/video/dialogs/GUIDialogSubtitles.cpp
index 1be5b6b1b6..0a65952cda 100644
--- a/xbmc/video/dialogs/GUIDialogSubtitles.cpp
+++ b/xbmc/video/dialogs/GUIDialogSubtitles.cpp
@@ -115,13 +115,13 @@ CGUIDialogSubtitles::~CGUIDialogSubtitles(void)
bool CGUIDialogSubtitles::OnMessage(CGUIMessage& message)
{
- if (message.GetMessage() == GUI_MSG_CLICKED &&
- (message.GetParam1() == ACTION_SELECT_ITEM ||
- message.GetParam1() == ACTION_MOUSE_LEFT_CLICK))
+ if (message.GetMessage() == GUI_MSG_CLICKED)
{
int iControl = message.GetSenderId();
+ bool selectAction = (message.GetParam1() == ACTION_SELECT_ITEM ||
+ message.GetParam1() == ACTION_MOUSE_LEFT_CLICK);
- if (iControl == CONTROL_SUBLIST)
+ if (selectAction && iControl == CONTROL_SUBLIST)
{
CGUIMessage msg(GUI_MSG_ITEM_SELECTED, GetID(), CONTROL_SUBLIST);
OnMessage(msg);
@@ -131,7 +131,7 @@ bool CGUIDialogSubtitles::OnMessage(CGUIMessage& message)
Download(*m_subtitles->Get(item));
return true;
}
- else if (iControl == CONTROL_SERVICELIST)
+ else if (selectAction && iControl == CONTROL_SERVICELIST)
{
CGUIMessage msg(GUI_MSG_ITEM_SELECTED, GetID(), CONTROL_SERVICELIST);
OnMessage(msg);