aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmarshallnz <jcmarsha@gmail.com>2014-04-24 11:36:48 +1200
committerJonathan Marshall <jmarshall@xbmc.org>2014-04-26 09:11:04 +1200
commitdd5d2f40310dae7bb25f83c3423d99baed975266 (patch)
tree6b3f435f9fc89c3bf3af0e27c631247cdd91e0e2
parentce273ed609ddd1199c84f3d0485bd271cb9c8081 (diff)
Merge pull request #4591 from amet/subs_fixes
Subs search fixes
-rw-r--r--xbmc/video/dialogs/GUIDialogSubtitles.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/xbmc/video/dialogs/GUIDialogSubtitles.cpp b/xbmc/video/dialogs/GUIDialogSubtitles.cpp
index 858f1f2a02..6447575d2f 100644
--- a/xbmc/video/dialogs/GUIDialogSubtitles.cpp
+++ b/xbmc/video/dialogs/GUIDialogSubtitles.cpp
@@ -138,10 +138,11 @@ bool CGUIDialogSubtitles::OnMessage(CGUIMessage& message)
OnMessage(msg);
int item = msg.GetParam1();
- if (item >= 0 && item < m_serviceItems->Size() &&
- SetService(m_serviceItems->Get(item)->GetProperty("Addon.ID").asString()))
+ if (item >= 0 && item < m_serviceItems->Size())
+ {
+ SetService(m_serviceItems->Get(item)->GetProperty("Addon.ID").asString());
Search();
-
+ }
return true;
}
else if (iControl == CONTROL_MANUALSEARCH)
@@ -202,6 +203,12 @@ void CGUIDialogSubtitles::Process(unsigned int currentTime, CDirtyRegionList &di
{
CGUIMessage message(GUI_MSG_LABEL_BIND, GetID(), CONTROL_SUBLIST, 0, 0, &subs);
OnMessage(message);
+ if (!subs.IsEmpty())
+ {
+ // focus subtitles list
+ CGUIMessage msg(GUI_MSG_SETFOCUS, GetID(), CONTROL_SUBLIST);
+ OnMessage(msg);
+ }
m_updateSubsList = false;
}