1 files changed, 20 insertions, 10 deletions

diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 299181b..8b295b0 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -1057,26 +1057,33 @@ void PlayListWidget::openFile() {
         qDebug( "Selected filename is " + filename );
 //            Om3u *m3uList;
             DocLnk lnk;
             Config cfg( "OpiePlayer" );
             cfg.setGroup("PlayList");
 
+        QString m3uFile;
+        m3uFile = filename;
         if(filename.left(4) == "http") {
-            QString m3uFile, m3uFilePath;
             if(filename.find(":",8,TRUE) != -1) { //found a port
-                m3uFile = filename.left( filename.find( ":",8,TRUE));
-                m3uFile = m3uFile.right(  7);
-            } else if(filename.left(4) == "http"){
-                m3uFile=filename;
-                m3uFile = m3uFile.right( m3uFile.length() - 7);
-            } else{
+
+//               m3uFile = filename.left( filename.find( ":",8,TRUE));
                 m3uFile=filename;
+                     if( m3uFile.right( 1 ).find( '/' ) == -1) {
+                         m3uFile += "/";
+                     }
+                filename = m3uFile;
+//                 qDebug("1 "+m3uFile);
+//             } else if(filename.left(4) == "http"){
+//                 m3uFile=filename;
+//                 m3uFile = m3uFile.right( m3uFile.length() - 7);
+//                 qDebug("2 "+m3uFile);
+//             } else{
+//                 m3uFile=filename;
+//                 qDebug("3 "+m3uFile);
             }
-
-//            qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"+ m3uFile);
-            lnk.setName( filename ); //sets name
+            lnk.setName( m3uFile ); //sets name
             lnk.setFile( filename ); //sets file name
             lnk.setIcon("opieplayer2/musicfile");
             d->selectedFiles->addToSelection(  lnk );
             writeCurrentM3u();
         }
         else if( filename.right( 3) == "m3u" ) {
@@ -1111,13 +1118,16 @@ void PlayListWidget::readm3u( const QString &filename ) {
     for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) {
         s = *it;
 //          qDebug("reading "+ s);
         if(s.left(4)=="http") {
           lnk.setName( s ); //sets file name
           lnk.setIcon("opieplayer2/musicfile");
+
+//          if(s.right(4) != '.' || s.right(5) != '.')
           if(s.right(4) != '.' || s.right(5) != '.')
+             if( s.right(1) != "/")
             lnk.setFile( s+"/"); //if url with no extension
           else
             lnk.setFile( s ); //sets file name
             
         }  else {
           //               if( QFileInfo( s ).exists() ) {