[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/amarok/src
From:       Andreas Mützel <andreas.muetzel () gmx ! net>
Date:       2008-10-26 11:47:08
Message-ID: 1225021628.343211.17064.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 876053 by amuetzel:

BUG: 173528

Pressing the stop button while the current track is fading out now stops fadeout \
instead of restarting it.


 M  +5 -1      EngineController.cpp  


--- trunk/extragear/multimedia/amarok/src/EngineController.cpp #876052:876053
@@ -331,8 +331,12 @@
         emit trackChanged( Meta::TrackPtr( 0 ) );
     }
 
-    if( m_fader )
+    if( m_fader ){
         m_fader->deleteLater();
+        m_media->stop();
+        if(m_fadeoutTimer)
+        	m_fadeoutTimer->stop();
+    }
 
     if( AmarokConfig::fadeout() && AmarokConfig::fadeoutLength() && !forceInstant ) \
                {
         stateChangedNotify( Phonon::StoppedState, Phonon::PlayingState ); \
//immediately disable Stop action


[prev in list] [next in list] [prev in thread] [next in thread]