--- a/controlpanelui/src/tonefetcher/src/tonefetcherwidget.cpp	Thu May 27 12:52:25 2010 +0300
+++ b/controlpanelui/src/tonefetcher/src/tonefetcherwidget.cpp	Fri Jun 11 13:39:17 2010 +0300
@@ -73,7 +73,7 @@
     
     //stop previewing when clicking another item.
     if (mServiceEngine->IsPlaying()) {
-        mServiceEngine->preview(getCurrentItemPath());
+        mServiceEngine->stop();
     }
     /*
      * when one item is selected, reselecting it will deselect it. selecting another 
@@ -171,7 +171,12 @@
 
 void ToneFetcherWidget::playOrPause() 
 {
+    if(mServiceEngine->IsPlaying()) {
+        mServiceEngine->stop();
+    } else {    
     mServiceEngine->preview(getCurrentItemPath());
+    }
+    
 }
 
 void ToneFetcherWidget::previewEvent(ToneFetcherEngine::TPreviewEvent event, int errorId) 
@@ -186,6 +191,11 @@
 
 void ToneFetcherWidget::onObjectChanged()
 {
+    if (mServiceEngine->IsPlaying()) {
+        mServiceEngine->stop();      
+    }
+    emit triggerToolBar(false);
+    mToneModel->toBeFreshed();
     mToneModel->clearAll();
     mDigitalSoundList.clear();
     mSimpleSoundList.clear();