1 files changed, 17 insertions, 14 deletions

diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index a1973e9..b187cb4 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -78,3 +78,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     setCaption( tr("OpiePlayer") );
-    qDebug("<<<<<audioWidget");
+    //    qDebug("<<<<<audioWidget");
     
@@ -92,3 +92,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
        
-    qDebug("skin path " + skinPath);
+    //    qDebug("skin path " + skinPath);
     
@@ -162,3 +162,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     setPlaying( mediaPlayerState->playing() );
-
+this->setFocus();
 }
@@ -167,13 +167,14 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
 AudioWidget::~AudioWidget() {
+   //       setPlaying( false);
     
     for ( int i = 0; i < 10; i++ ) {
-        delete buttonPixUp[i];
-        delete buttonPixDown[i];
+        if(buttonPixUp[i]) delete buttonPixUp[i];
+        if(buttonPixDown[i]) delete buttonPixDown[i];
     }
-    delete pixBg;
-    delete imgUp;
-    delete imgDn;
-    delete imgButtonMask;
+    if(pixBg) delete pixBg;
+    if(imgUp) delete imgUp;
+    if(imgDn) delete imgDn;
+    if(imgButtonMask) delete imgButtonMask;
     for ( int i = 0; i < 10; i++ ) {
-        delete masks[i];
+        if(masks[i]) delete masks[i];
     }
@@ -281,2 +282,3 @@ void AudioWidget::setView( char view ) {
     }
+
 }
@@ -292,2 +294,3 @@ static QString timeAsString( long length ) {
 void AudioWidget::updateSlider( long i, long max ) {
+this->setFocus();
     time.setText( timeAsString( i ) + " / " + timeAsString( max ) );
@@ -359,4 +362,4 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
 
-            if ( isOnButton && i == AudioVolumeUp ) 
-                qDebug("on up");
+//              if ( isOnButton && i == AudioVolumeUp ) 
+//                  qDebug("on up");
 
@@ -367,3 +370,3 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
                   case AudioVolumeUp:   
-                      qDebug("more clicked");
+                     //                      qDebug("more clicked");
                       emit moreClicked(); 
@@ -371,3 +374,3 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
                   case AudioVolumeDown:
-                      qDebug("less clicked");
+                     //                      qDebug("less clicked");
                       emit lessClicked();