1 files changed, 13 insertions, 3 deletions

diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 2323ac2..eeaed33 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -848,17 +848,18 @@ void PlayListWidget::tabChanged(QWidget *widg) {
 
 void PlayListWidget::btnPlay(bool b) {
 
 //    mediaPlayerState->setPlaying(b);
     switch ( tabWidget->currentPageIndex()) {
       case 0:
       {
           qDebug("here we are");
-          if( d->selectedFiles->current()->file().find(" ",0,TRUE) != -1 || d->selectedFiles->current()->file().find("%20",0,TRUE) != -1) {
+          if( d->selectedFiles->current()->file().find(" ",0,TRUE) != -1
+              || d->selectedFiles->current()->file().find("%20",0,TRUE) != -1) {
               QMessageBox::message("Note","You are trying to play\na malformed url.");
         
           } else { 
 
               mediaPlayerState->setPlaying(b);
           }      }
       break;
       case 1:
@@ -1228,30 +1229,39 @@ void PlayListWidget::readm3u(const QString &filename) {
                         s=s.right(s.length()-2);
                         DocLnk lnk( s );
                         QFileInfo f(s);
                         QString name = f.baseName();
                         name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1);
                         lnk.setName( name);
                         s=s.replace( QRegExp("\\"),"/");
                         lnk.setFile( s);
+                        lnk.writeLink();
 //                         lnk.setIcon(opieplayer/MPEGPlayer);
                         qDebug("add "+name);
                          d->selectedFiles->addToSelection( lnk);
                     } else { // is url
 
                         s.replace(QRegExp("%20")," ");
                          DocLnk lnk( s);
-                         QString name = s.right( s.length() - 7);
+                          QString name;
+                         if(name.left(4)=="http")
+                             name = s.right( s.length() - 7);
+                         else
+                             name=s;
 //                         name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1);
                          lnk.setName(name);
-                         lnk.setFile( s+"/");
+                         if(s.at(s.length()-4) == '.')
+                             lnk.setFile( s);
+                         else
+                             lnk.setFile( s+"/");
 //                         lnk.setFile( filename);
 //                         lnk.setComment( s+"/");
                          lnk.setType("audio/x-mpegurl");
+                        lnk.writeLink();
 //                          lnk.setIcon( "opieplayer/MPEGPlayer");
 //                          qDebug("add "+s);
                        d->selectedFiles->addToSelection( lnk);
                     }
                     i++;
                  }
             }
         }