--- a/app/src/mpmainwindow.cpp	Fri Jul 23 17:31:12 2010 -0500
+++ b/app/src/mpmainwindow.cpp	Fri Aug 06 16:51:36 2010 -0500
@@ -31,6 +31,7 @@
 #include "mpenginefactory.h"
 #include "mpsettingsmanager.h"
 #include "mpglobalpopuphandler.h"
+#include "mpmediacontroller.h"
 #include "mptrace.h"
 
 const QString MUSIC_MAIN_VIEW = "MusicMainView";
@@ -60,7 +61,8 @@
       mMusicServices(0),
       mPopupHandler(0),
       mUserExit( false ),
-      mActivityManager(0)
+      mActivityManager(0),
+      mMpMediaController(0)
 {
     TX_LOG
 }
@@ -94,7 +96,10 @@
     if (mMediaWallViewPlugin) {
         mMediaWallViewPlugin->destroyView();
         delete mMediaWallViewPlugin;
-    }    
+    }
+
+    delete mMpMediaController;
+
     MpEngineFactory::close();
 
 
@@ -183,6 +188,7 @@
         mActivityManager->removeActivity( MUSIC_NOW_PLAYING_VIEW );
         connect( app, SIGNAL( activate() ), this , SLOT( handleActivity() ) );
         connect( app, SIGNAL( aboutToQuit() ), this, SLOT( saveActivity() ) );
+        mMpMediaController = new MpMediaController();
         emit applicationReady();
         
     }
@@ -395,6 +401,7 @@
         Q_ASSERT_X(false, "MpMainWindow::initializeServiceView", "undefined service");
         break;
     }
+    mMpMediaController = new MpMediaController();
     emit applicationReady();
 }