Permalink
Browse files

view control in login window was cleared on deinit rather than on unl…

…oad. fixes #13813.
  • Loading branch information...
1 parent 3c2fc89 commit 495ad53f15b30e56965a3e74d5e21fd2626f094a Jonathan Marshall committed Jan 7, 2013
Showing with 7 additions and 1 deletion.
  1. +6 −1 xbmc/windows/GUIWindowLoginScreen.cpp
  2. +1 −0 xbmc/windows/GUIWindowLoginScreen.h
@@ -71,7 +71,6 @@ bool CGUIWindowLoginScreen::OnMessage(CGUIMessage& message)
{
case GUI_MSG_WINDOW_DEINIT:
{
- m_viewControl.Reset();
m_vecItems->Clear();
}
break;
@@ -185,6 +184,12 @@ void CGUIWindowLoginScreen::OnWindowLoaded()
m_viewControl.AddView(GetControl(CONTROL_BIG_LIST));
}
+void CGUIWindowLoginScreen::OnWindowUnload()
+{
+ CGUIWindow::OnWindowUnload();
+ m_viewControl.Reset();
+}
+
void CGUIWindowLoginScreen::Update()
{
m_vecItems->Clear();
@@ -43,6 +43,7 @@ class CGUIWindowLoginScreen : public CGUIWindow
protected:
virtual void OnInitWindow();
virtual void OnWindowLoaded();
+ virtual void OnWindowUnload();
void Update();
void SetLabel(int iControl, const CStdString& strLabel);

0 comments on commit 495ad53

Please sign in to comment.