2 files changed, 29 insertions, 23 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index ef606ab..714509e 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -330,49 +330,52 @@ void AudioWidget::timerEvent( QTimerEvent * ) {
     }  else if ( skipDirection == -1 ) {
         mediaPlayerState.setPosition( mediaPlayerState.position() - 2 );
     }
 }
 
 
 void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
     for ( unsigned int i = 0; i < buttons.count(); i++ ) {
+
+        Button &button = buttons[ i ];
+
         if ( event->state() == QMouseEvent::LeftButton ) {
             // The test to see if the mouse click is inside the button or not
             bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i );
 
-            if ( isOnButton && !buttons[i].isHeld ) {
-                buttons[i].isHeld = TRUE;
-                toggleButton( buttons[ i ] );
+            if ( isOnButton && !button.isHeld ) {
+                button.isHeld = TRUE;
+                toggleButton( button );
                 switch (i) {
                 case VolumeUp:
                     emit moreClicked();
                     return;
                 case VolumeDown:
                     emit lessClicked();
                     return;
                 case Forward:
                     emit forwardClicked();
                     return;
                 case Back:
                     emit backClicked();
                     return;
                 }
-            } else if ( !isOnButton && buttons[i].isHeld ) {
-                buttons[i].isHeld = FALSE;
-                toggleButton( buttons[ i ] );
+            } else if ( !isOnButton && button.isHeld ) {
+                button.isHeld = FALSE;
+                toggleButton( button );
             }
         } else {
-            if ( buttons[i].isHeld ) {
-                buttons[i].isHeld = FALSE;
-                if ( buttons[i].type != ToggleButton ) {
-                    setToggleButton( buttons[ i ], FALSE );
+            if ( button.isHeld ) {
+                button.isHeld = FALSE;
+                if ( button.type != ToggleButton ) {
+                    setToggleButton( button, FALSE );
                 }
                 qDebug("mouseEvent %d", i);
-                handleCommand( static_cast<Command>( i ), buttons[ i ].isDown );
+                handleCommand( static_cast<Command>( i ), button.isDown );
             }
         }
     }
 }
 
 
 void AudioWidget::mousePressEvent( QMouseEvent *event ) {
     mouseMoveEvent( event );
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 673c9e8..9782b68 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -239,53 +239,56 @@ void VideoWidget::updateSlider( long i, long max ) {
         if ( slider->maxValue() != width ) {
             slider->setMaxValue( width );
         }
     }
 }
 
 void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
     for ( unsigned int i = 0; i < buttons.count(); i++ ) {
+
+        Button &button = buttons[ i ];
+
         if ( event->state() == QMouseEvent::LeftButton ) {
             // The test to see if the mouse click is inside the button or not
             bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i );
 
-            if ( isOnButton && !buttons[i].isHeld ) {
-                buttons[i].isHeld = TRUE;
-                toggleButton( buttons[ i ] );
+            if ( isOnButton && !button.isHeld ) {
+                button.isHeld = TRUE;
+                toggleButton( button );
 
                 switch (i) {
                 case VideoVolUp:
                     emit moreClicked();
                     return;
                 case VideoVolDown:
                     emit lessClicked();
                     return;
                 }
-            } else if ( !isOnButton && buttons[i].isHeld ) {
-                        buttons[i].isHeld = FALSE;
-                        toggleButton( buttons[ i ] );
+            } else if ( !isOnButton && button.isHeld ) {
+                        button.isHeld = FALSE;
+                        toggleButton( button );
             }
         } else {
 
-            if ( buttons[i].isHeld ) {
-                buttons[i].isHeld = FALSE;
-                if ( buttons[i].type != ToggleButton ) {
-                    setToggleButton( buttons[ i ], FALSE );
+            if ( button.isHeld ) {
+                button.isHeld = FALSE;
+                if ( button.type != ToggleButton ) {
+                    setToggleButton( button, FALSE );
                 }
 
                 switch(i) {
 
                 case VideoPlay: {
                     if( mediaPlayerState.isPaused() ) {
-                        setToggleButton( buttons[ i ], FALSE );
+                        setToggleButton( button, FALSE );
                         mediaPlayerState.setPaused( FALSE );
                         return;
                     } else if( !mediaPlayerState.isPaused() ) {
-                        setToggleButton( buttons[ i ], TRUE );
+                        setToggleButton( button, TRUE );
                         mediaPlayerState.setPaused( TRUE );
                         return;
                     } else {
                         return;
                     }
                 }
 
                 case VideoStop:       mediaPlayerState.setPlaying( FALSE ); return;