1 files changed, 4 insertions, 6 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 8659971..56b75f2 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -72,18 +72,16 @@ void changeTextColor( QWidget * w) {
 
 AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) :
 
     MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ),  time( this ),
     audioSliderBeingMoved( false )
 {
+    Button defaultButton;
 
-    Button defaultButton; 
-    defaultButton.isToggle = defaultButton.isHeld = defaultButton.isDown = false;
-    Button toggleButton;
-    toggleButton.isToggle = true;
-    toggleButton.isHeld = toggleButton.isDown = false;
+    Button toggleButton = defaultButton;
+    toggleButton.buttonType = ToggleButton;
 
     buttons.reserve( 10 );
     buttons.push_back( toggleButton ); // play
     buttons.push_back( defaultButton ); // stop
     buttons.push_back( defaultButton ); // next
     buttons.push_back( defaultButton ); // previous
@@ -386,13 +384,13 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
                 buttons[i].isHeld = FALSE;
                 toggleButton(i);
             }
         } else {
             if ( buttons[i].isHeld ) {
                 buttons[i].isHeld = FALSE;
-                if ( !buttons[i].isToggle ) {
+                if ( buttons[i].buttonType != ToggleButton ) {
                     setToggleButton( i, FALSE );
                 }
                 qDebug("mouseEvent %d", i);
                 handleCommand( static_cast<Command>( i ), buttons[ i ].isDown );
             }
         }