Merge pull request xbmc#17115 from Montellese/bugfix/select_addon_dep…

…endencies

CGUIDialogSelect: fix focusing list / buttons after 6d34db9

xbmc/dialogs/GUIDialogSelect.cpp

@@ -126,7 +126,7 @@ bool CGUIDialogSelect::OnMessage(CGUIMessage& message)
     {
       if (m_viewControl.HasControl(message.GetControlId()))
       {
-        if (m_vecList->IsEmpty() || m_focusToButton)
+        if (m_vecList->IsEmpty())
         {
           if (m_bButtonEnabled)
             SET_CONTROL_FOCUS(CONTROL_EXTRA_BUTTON, 0);
@@ -335,6 +335,16 @@ void CGUIDialogSelect::OnInitWindow()
 
   CGUIDialogBoxBase::OnInitWindow();
 
+  // focus one of the buttons if explicitly requested
+  // ATTENTION: this must be done after calling CGUIDialogBoxBase::OnInitWindow()
+  if (m_focusToButton)
+  {
+    if (m_bButtonEnabled)
+      SET_CONTROL_FOCUS(CONTROL_EXTRA_BUTTON, 0);
+    else
+      SET_CONTROL_FOCUS(CONTROL_CANCEL_BUTTON, 0);
+  }
+
   // if nothing is selected, select first item
   m_viewControl.SetSelectedItem(std::max(GetSelectedItem(), 0));
 }