Skip to content
Browse files

make sure we setup the visualisation preset list prior to init'ing th…

…e window. part of #13556
  • Loading branch information...
1 parent 18e10be commit c0e9cc0b31dbe12b2275c045a25c88cd52046e25 Jonathan Marshall committed
View
18 xbmc/music/dialogs/GUIDialogVisualisationPresetList.cpp
@@ -67,16 +67,6 @@ bool CGUIDialogVisualisationPresetList::OnMessage(CGUIMessage &message)
}
}
break;
- case GUI_MSG_WINDOW_INIT:
- {
- CGUIDialog::OnMessage(message);
-
- CGUIMessage msg(GUI_MSG_GET_VISUALISATION, 0, 0);
- g_windowManager.SendMessage(msg);
- SetVisualisation((CVisualisation*)msg.GetPointer());
- return true;
- }
- break;
case GUI_MSG_WINDOW_DEINIT:
case GUI_MSG_VISUALISATION_UNLOADING:
{
@@ -122,6 +112,14 @@ void CGUIDialogVisualisationPresetList::FrameMove()
CGUIDialog::FrameMove();
}
+void CGUIDialogVisualisationPresetList::OnInitWindow()
+{
+ CGUIMessage msg(GUI_MSG_GET_VISUALISATION, 0, 0);
+ g_windowManager.SendMessage(msg);
+ SetVisualisation((CVisualisation*)msg.GetPointer());
+ CGUIDialog::OnInitWindow();
+}
+
void CGUIDialogVisualisationPresetList::Update()
{
m_vecPresets->Clear();
View
1 xbmc/music/dialogs/GUIDialogVisualisationPresetList.h
@@ -38,6 +38,7 @@ class CGUIDialogVisualisationPresetList :
virtual void FrameMove();
protected:
+ virtual void OnInitWindow();
void SetVisualisation(ADDON::CVisualisation *addon);
void Update();
ADDON::CVisualisation* m_viz; //TODO get rid

0 comments on commit c0e9cc0

Please sign in to comment.
Something went wrong with that request. Please try again.