aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpieh <misiek.piechowiak@gmail.com>2012-09-19 19:46:31 +0200
committerpieh <misiek.piechowiak@gmail.com>2012-09-19 23:45:50 +0200
commit90fa342cbbdc1196b4e371aa9291d72672d33d88 (patch)
tree07b8eb9b0d03198ca63517dd6b3960ea8eab62f3
parenta607b80f6b3a74a1a7d87fc3c4dc2b980365e77a (diff)
fix defaultcontrol for containers after f2e9d06, initial static items processing is now done after CGUIBaseContainer::AllocResources
-rw-r--r--xbmc/guilib/GUIBaseContainer.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/xbmc/guilib/GUIBaseContainer.cpp b/xbmc/guilib/GUIBaseContainer.cpp
index a6287ce27b..09845116ca 100644
--- a/xbmc/guilib/GUIBaseContainer.cpp
+++ b/xbmc/guilib/GUIBaseContainer.cpp
@@ -778,9 +778,8 @@ void CGUIBaseContainer::ValidateOffset()
void CGUIBaseContainer::AllocResources()
{
+ CGUIControl::AllocResources();
CalculateLayout();
- if (m_staticDefaultItem != -1) // select default item
- SelectStaticItemById(m_staticDefaultItem);
}
void CGUIBaseContainer::FreeResources(bool immediately)
@@ -894,6 +893,8 @@ void CGUIBaseContainer::SetInitialVisibility()
{
UpdateStaticItems(true);
CGUIControl::SetInitialVisibility();
+ if (m_staticDefaultItem != -1) // select default item
+ SelectStaticItemById(m_staticDefaultItem);
}
void CGUIBaseContainer::CalculateLayout()