Index: mythplugins/mythmusic/mythmusic/mainvisual.h
===================================================================
--- mythplugins/mythmusic/mythmusic/mainvisual.h	(revision 13300)
+++ mythplugins/mythmusic/mythmusic/mainvisual.h	(working copy)
@@ -130,14 +130,14 @@
 
 private:
     VisualBase *vis;
-    InfoWidget* info_widget;
     Metadata *meta;
     QPixmap pixmap;
     QPtrList<VisualNode> nodes;
+    bool playing;
+    int fps;
     QTimer *timer;
     QTimer *bannerTimer;
-    bool playing;
-    int fps;
+    InfoWidget* info_widget;
 
     QString current_visual_name;
 };
Index: mythplugins/mythmusic/mythmusic/metadata.cpp
===================================================================
--- mythplugins/mythmusic/mythmusic/metadata.cpp	(revision 13300)
+++ mythplugins/mythmusic/mythmusic/metadata.cpp	(working copy)
@@ -1375,8 +1375,8 @@
 /**************************************************************************/
 
 AlbumArtImages::AlbumArtImages(Metadata *metadata)
+    : m_parent(metadata)
 {
-    m_parent = metadata;
     m_imageList.setAutoDelete(true);
 
     findImages();
@@ -1386,6 +1386,9 @@
 {
     m_imageList.clear();
 
+    if (m_parent == NULL)
+        return;
+
     QFileInfo fi(m_parent->Filename());
     QString dir = fi.dirPath(true);
     dir.remove(0, Metadata::GetStartdir().length());
Index: mythplugins/mythmusic/mythmusic/mainvisual.cpp
===================================================================
--- mythplugins/mythmusic/mythmusic/mainvisual.cpp	(revision 13300)
+++ mythplugins/mythmusic/mythmusic/mainvisual.cpp	(working copy)
@@ -77,7 +77,8 @@
 }
 
 MainVisual::MainVisual(QWidget *parent, const char *name)
-    : QWidget( parent, name ), vis( 0 ), playing( FALSE ), fps( 20 )
+    : QWidget(parent, name), vis(0), meta(0), playing(FALSE), fps(20),
+      timer (0), bannerTimer(0), info_widget(0)
 {
     int screenwidth = 0, screenheight = 0;
     float wmult = 0, hmult = 0;
