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

…e window. part of xbmc#13556
pieh · Nov 16, 2012 · c0e9cc0 · c0e9cc0
1 parent 18e10be
commit c0e9cc0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/xbmc/music/dialogs/GUIDialogVisualisationPresetList.cpp b/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();

diff --git a/xbmc/music/dialogs/GUIDialogVisualisationPresetList.h b/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