fix writng m3u filenames when user specifies a directory

1 files changed, 11 insertions, 10 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 6e2457f..707f4d2 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -806,61 +806,62 @@ void PlayListWidget::readListFromFile( const QString &filename ) {
            //      qDebug( "add writeCurrentM3u " +d->selectedFiles->current()->file());
            m3uList->add( d->selectedFiles->current()->file() );
        }
        while ( d->selectedFiles->next() );
        //    qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" );
        m3uList->write();
       m3uList->close();
    }
    delete m3uList;
 
  }
 
   /*
  writes current playlist to m3u file */
 void PlayListWidget::writem3u() {
     InputDialog *fileDlg;
     fileDlg = new InputDialog( this, tr( "Save m3u Playlist " ), TRUE, 0);
     fileDlg->exec();
     QString name, filename, list;
     Om3u *m3uList;
 
     if( fileDlg->result() == 1 ) {
         name = fileDlg->text();
 //        qDebug( filename );
-
-        if( name.left( 1) != "/" ) {
-            filename = QPEApplication::documentDir() + "/" + name;
-        }
-
-        if( name.right( 3 ) != "m3u" ) {
-            filename = QPEApplication::documentDir() + "/" +name+".m3u";
+        if( name.find("/",0,true) != -1) {// assume they specify a file path
+            filename = name;
+            name = name.right(name.length()- name.findRev("/",-1,true) - 1 );
         }
+        else //otherwise dump it somewhere noticable
+            filename = QPEApplication::documentDir() + "/" + name;
 
-        if( d->selectedFiles->first()) {
-          m3uList = new Om3u(filename, IO_ReadWrite);
+        if( filename.right( 3 ) != "m3u" ) //needs filename extension
+            filename += ".m3u";
+        
+        if( d->selectedFiles->first()) { //ramble through playlist view
+            m3uList = new Om3u( filename, IO_ReadWrite);
 
-          do {
+            do {
             m3uList->add( d->selectedFiles->current()->file());
           }
           while ( d->selectedFiles->next() );
           //    qDebug( list );
           m3uList->write();
           m3uList->close();
           delete m3uList;
 
           delete fileDlg;
 
           DocLnk lnk;
           lnk.setFile( filename);
           lnk.setIcon("opieplayer2/playlist2");
           lnk.setName( name); //sets file name
 
           // qDebug(filename);
           Config config( "OpiePlayer" );
           config.setGroup( "PlayList" );
 
           config.writeEntry("CurrentPlaylist",filename);
           currentPlayList=filename;
 
           if(!lnk.writeLink()) {
             qDebug("Writing doclink did not work");