From c0e9cc0b31dbe12b2275c045a25c88cd52046e25 Mon Sep 17 00:00:00 2001
From: Jonathan Marshall <jmarshall@never.you.mind>
Date: Fri, 16 Nov 2012 20:54:22 +1300
Subject: [PATCH] make sure we setup the visualisation preset list prior to
 init'ing the window. part of #13556

---
 .../GUIDialogVisualisationPresetList.cpp       | 18 ++++++++----------
 .../dialogs/GUIDialogVisualisationPresetList.h |  1 +
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/xbmc/music/dialogs/GUIDialogVisualisationPresetList.cpp b/xbmc/music/dialogs/GUIDialogVisualisationPresetList.cpp
index 0c2c40cb5b393..8320acb11f29b 100644
--- 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
index 04828ce951c20..99ac7381c2844 100644
--- 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