Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

CGUIWindow::Initialize fixes/changes #1608

Merged
merged 2 commits into from Oct 29, 2012

Conversation

Projects
None yet
2 participants
Member

pieh commented Oct 12, 2012

First commit fixes context menu dialogs with conditional includes not showing context buttons (as Initialize didn't realize that include conditions are changed and report window as ready, when it's not and it will be loaded later when we show window - that is after we setup context buttons) - Here's forum topic about it http://forum.xbmc.org/showthread.php?tid=142506&pid=1211421#pid1211421

Second commit makes sure we return proper value if called not from app thread.

Member

jmarshallnz commented Oct 12, 2012

Looks OK. I note that the second doesn't deadlock as the graphics context is released in CAppMessenger::SendMessage.

@pieh pieh was assigned Oct 13, 2012

pieh added some commits Oct 12, 2012

@pieh pieh add helper method to check if window need to reload and use it in CGU…
…IWindow::Initialize()

use CGUIWindow::AllocResources() to handle potentional window unload (if include conditions would change)
c344b48
@pieh pieh CGUIWindow::Initiliaze() called offthread use application messenger t…
…o initialize window, wait for it to handle load message and return m_windowLoaded (don't assume window load was succesfull)
2c316ee

@pieh pieh added a commit that referenced this pull request Oct 29, 2012

@pieh pieh Merge pull request #1608 from pieh/xp_context_menu
CGUIWindow::Initialize fixes/changes
d9d0126

@pieh pieh merged commit d9d0126 into xbmc:master Oct 29, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment