2 files changed, 12 insertions, 17 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index b78ce24..889667c 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -51,17 +51,18 @@
 #include "om3u.h"
 #include "playlistfileview.h"
 
 //only needed for the random play
 #include <stdlib.h>
 #include <assert.h>
 
 PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name )
-    : PlayListWidgetGui( mediaPlayerState, parent, name ) {
+    : PlayListWidgetGui( mediaPlayerState, parent, name ) , currentFileListView( 0 ) 
+{
 
     d->tbAddToList =  new ToolButton( bar, tr( "Add to Playlist" ),
                                       "opieplayer2/add_to_playlist",
                                       this , SLOT(addSelected() ) );
     d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ),
                                           "opieplayer2/remove_from_playlist",
                                           this , SLOT(removeSelected() ) );
     d->tbPlay    = new ToolButton( bar, tr( "Play" ), "opieplayer2/play",
@@ -472,30 +473,29 @@ void PlayListWidget::loadList( const DocLnk & lnk) {
         readm3u(lnk.file());
         tabWidget->setCurrentPage(0);
     }
 }
 
 void PlayListWidget::addSelected() {
   assert( inFileListMode() );
 
-  QListView *fileListView = currentFileListView();
-  QListViewItemIterator it( fileListView );
+  QListViewItemIterator it( currentFileListView );
   for ( ; it.current(); ++it )
       if ( it.current()->isSelected() ) {
           QString filename = it.current()->text(3);
 
           DocLnk lnk;
           lnk.setName( QFileInfo( filename ).baseName() ); //sets name
           lnk.setFile( filename ); //sets file name
 
           d->selectedFiles->addToSelection( lnk );
       }
 
-  fileListView->clearSelection();
+  currentFileListView->clearSelection();
 
   tabWidget->setCurrentPage( 0 );
   writeCurrentM3u();
 }
 
 
 void PlayListWidget::removeSelected() {
     d->selectedFiles->removeSelected( );
@@ -537,16 +537,18 @@ void PlayListWidget::tabChanged(QWidget *) {
 
     d->tbPlay->setEnabled( true );
 
     disconnect( audioView, SIGNAL( itemsSelected( bool ) ),
                 d->tbPlay, SLOT( setEnabled( bool ) ) );
     disconnect( videoView, SIGNAL( itemsSelected( bool ) ),
                 d->tbPlay, SLOT( setEnabled( bool ) ) );
 
+    currentFileListView = 0;
+
     switch ( currentTab() ) {
     case CurrentPlayList:
     {
         if( !tbDeletePlaylist->isHidden() )  {
             tbDeletePlaylist->hide();
         }
         d->tbRemoveFromList->setEnabled(TRUE);
         d->tbAddToList->setEnabled(FALSE);
@@ -563,31 +565,35 @@ void PlayListWidget::tabChanged(QWidget *) {
         }
         d->tbRemoveFromList->setEnabled(FALSE);
         d->tbAddToList->setEnabled(TRUE);
 
         connect( audioView, SIGNAL( itemsSelected( bool ) ),
                  d->tbPlay, SLOT( setEnabled( bool ) ) );
 
         d->tbPlay->setEnabled( audioView->hasSelection() );
+
+        currentFileListView = audioView;
     }
     break;
     case VideoFiles:
     {
         videoView->populateView();
         if( !tbDeletePlaylist->isHidden() ) {
             tbDeletePlaylist->hide();
         }
         d->tbRemoveFromList->setEnabled(FALSE);
         d->tbAddToList->setEnabled(TRUE);
 
         connect( videoView, SIGNAL( itemsSelected( bool ) ),
                  d->tbPlay, SLOT( setEnabled( bool ) ) );
 
         d->tbPlay->setEnabled( videoView->hasSelection() );
+
+        currentFileListView = videoView;
     }
     break;
     case PlayLists:
     {
         if( tbDeletePlaylist->isHidden() ) {
             tbDeletePlaylist->show();
         }
         playLists->reread();
@@ -620,26 +626,16 @@ void PlayListWidget::deletePlaylist() {
   };
 }
 
 
 void PlayListWidget::playSelected() {
     btnPlay( TRUE);
 }
 
-QListView *PlayListWidget::currentFileListView() const
-{
-    switch ( currentTab() ) {
-        case AudioFiles: return audioView;
-        case VideoFiles: return videoView;
-        default: assert( false );
-    }
-    return 0;
-}
-
 bool PlayListWidget::inFileListMode() const
 {
     TabType tab = currentTab();
     return tab == AudioFiles || tab == VideoFiles;
 }
 
 void PlayListWidget::openFile() {
                 // http://66.28.164.33:2080
@@ -1004,10 +1000,10 @@ PlayListWidget::Entry PlayListWidget::currentEntry() const
         const DocLnk *lnk = current();
         return Entry( lnk->name(), lnk->file() );
     }
 
     return Entry( currentFileListPathName() );
 }
 
 QString PlayListWidget::currentFileListPathName() const {
-    return currentFileListView()->currentItem()->text( 3 );
+    return currentFileListView->currentItem()->text( 3 );
 }
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index 5c8f30c..e8bf211 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -93,18 +93,16 @@ signals:
     void skinSelected();
 
 private:
     int defaultSkinIndex;
     void readm3u(const QString &);
     void readPls(const QString &);
     void initializeStates();
 
-    QListView *currentFileListView() const;
-
     bool inFileListMode() const;
 
 private slots:
     void populateSkinsMenu();
     void skinsMenuActivated(int);
     void pmViewActivated(int);
     void writem3u();
     void writeCurrentM3u();
@@ -128,12 +126,13 @@ private slots:
     void playlistViewPressed( int, QListViewItem *, const QPoint&, int);
     void playSelected();
 
 private:
     bool fromSetDocument;
     bool insanityBool;
     QString setDocFileRef, currentPlayList;
     int selected;
+    QListView *currentFileListView;
 };
 
 #endif // PLAY_LIST_WIDGET_H