2 files changed, 18 insertions, 7 deletions

diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp
index faadd72..8f04d0d 100644
--- a/core/multimedia/opieplayer/audiodevice.cpp
+++ b/core/multimedia/opieplayer/audiodevice.cpp
@@ -24,8 +24,13 @@
 #include <stdio.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
+#include <qmessagebox.h>
+
 #include "audiodevice.h"
 
+
+#include <errno.h>
+
 #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
 #include "qpe/qcopenvelope_qws.h"
 #endif
@@ -209,8 +214,14 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
     if ( AudioDevicePrivate::dspFd == 0 ) {
 #endif
         if ( ( d->handle = ::open( "/dev/dsp", O_WRONLY ) ) < 0 ) {
-            perror("open(\"/dev/dsp\") sending to /dev/null instead");
-            d->handle = ::open( "/dev/null", O_WRONLY );
+
+//            perror("open(\"/dev/dsp\") sending to /dev/null instead");
+        perror("open(\"/dev/dsp\")");
+        QString errorMsg=tr("Somethin's wrong with\nyour sound device.\nopen(\"/dev/dsp\")\n")+(QString)strerror(errno)+tr("\n\nClosing player now.");
+        QMessageBox::critical(0, "Vmemo", errorMsg, tr("Abort"));
+        exit(-1); //harsh?
+//            d->handle = ::open( "/dev/null", O_WRONLY );
+          // WTF?!?!
         }
 #ifdef KEEP_DEVICE_OPEN 
         AudioDevicePrivate::dspFd = d->handle;
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index ae25fe3..0332237 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -417,10 +417,10 @@ void PlayListWidget::writeConfig( Config& cfg ) const {
 
 void PlayListWidget::addToSelection( const DocLnk& lnk ) {
 //    qDebug("add");
-    if( lnk.file().find(" ",0,TRUE) != -1 || lnk.file().find("%20",0,TRUE) != -1) {
-        QMessageBox::message("Note","You are trying to play\na malformed url.");
+//     if( lnk.file().find(" ",0,TRUE) != -1 || lnk.file().find("%20",0,TRUE) != -1) {
+//         QMessageBox::message("Note","You are trying to play\na malformed url.");
         
-    } else { 
+//     } else { 
 
         d->setDocumentUsed = FALSE;
         if ( mediaPlayerState->playlist() ) {
@@ -429,7 +429,7 @@ void PlayListWidget::addToSelection( const DocLnk& lnk ) {
         }
         else
             mediaPlayerState->setPlaying( TRUE );
-    }
+//    }
 }
 
 
@@ -855,7 +855,7 @@ void PlayListWidget::btnPlay(bool b) {
       {
 //            if( d->selectedFiles->current()->file().find(" ",0,TRUE) != -1
 //                if( d->selectedFiles->current()->file().find("%20",0,TRUE) != -1) {
-                QMessageBox::message("Note","You are trying to play\na malformed url.");
+//                 QMessageBox::message("Note","You are trying to play\na malformed url.");
 //            } else { 
               mediaPlayerState->setPlaying(b);
 //          }