--- a/radioapp/radiouiengine/src/radiostationmodel_p.cpp	Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiouiengine/src/radiostationmodel_p.cpp	Fri Jun 11 13:38:32 2010 +0300
@@ -34,7 +34,7 @@
 /**
  * Timeout period for checking if station is sending dynamic PS in milliseconds
  */
-const int KDynamicPsCheckTimeout = 10 * 1000;
+const int DYNAMIC_PS_CHECK_TIMEOUT = 10 * 1000;
 
 /*!
  *
@@ -46,9 +46,9 @@
     mCurrentStation( &mManualStation ),
     mDynamicPsTimer( new QTimer() )
 {
-    connectAndTest( mDynamicPsTimer.data(), SIGNAL(timeout()),
+    Radio::connect( mDynamicPsTimer.data(), SIGNAL(timeout()),
                     q_ptr,                  SLOT(dynamicPsCheckEnded()) );
-    mDynamicPsTimer->setInterval( KDynamicPsCheckTimeout );
+    mDynamicPsTimer->setInterval( DYNAMIC_PS_CHECK_TIMEOUT );
     mDynamicPsTimer->setSingleShot( true );
 }
 
@@ -96,6 +96,7 @@
     Q_Q( RadioStationModel );
     if ( oldStation && oldStation->isValid() ) {
         q->emitDataChanged( *oldStation );
+        q->emitDataChanged( *mCurrentStation );
     }
 }
 
@@ -310,6 +311,7 @@
     if ( persistentSave ) {
         const bool success = mPresetStorage->savePreset( *station.data_ptr() );
         RADIO_ASSERT( success, "RadioStationModelPrivate::saveStation", "Failed to add station" );
+        Q_UNUSED( success );
     }
 }