2 files changed, 12 insertions, 8 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index a708cf6..92da73b 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -784,16 +784,25 @@ void PlayListWidget::populateVideoView() {
                    QString::number( QFile( Vdit.current()->file() ).size() ),
                                                    ""/*storage*/, Vdit.current()->file());
             newItem->setPixmap(0, Resource::loadPixmap( "opieplayer2/videofile" ) );
         }
     }
     videoPopulated=true;
 }
 
+QListView *PlayListWidget::currentFileListView() const
+{
+    switch ( currentTab() ) {
+        case AudioFiles: return audioView;
+        case VideoFiles: return videoView;
+        default: assert( false );
+    }
+    return 0;
+}
 
 void PlayListWidget::openFile() {
                 // http://66.28.164.33:2080
                 // http://somafm.com/star0242.m3u
     QString filename, name;
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0);
     fileDlg->exec();
@@ -1148,17 +1157,10 @@ PlayListWidget::TabType PlayListWidget::currentTab() const
 
     int index = tabWidget->currentPageIndex();
     assert( index < NumTabTypes && index >= 0 );
 
     return indexToTabType[ index ];
 }
 
 QString PlayListWidget::currentFileListPathName() const {
-    switch (currentTab()) {
-      case AudioFiles:
-          return audioView->currentItem()->text(3);
-      case VideoFiles:
-          return videoView->currentItem()->text(3);
-      default: assert( false );
-    };
-    return QString::null;
+    return currentFileListView()->currentItem()->text( 3 );
 }
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index 7044abe..a608eae 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -85,16 +85,18 @@ private:
     int defaultSkinIndex;
     bool audioScan, videoScan, audioPopulated, videoPopulated;
     void readm3u(const QString &);
     void readPls(const QString &);
     void initializeStates();
     void populateAudioView();
     void populateVideoView();
 
+    QListView *currentFileListView() const;
+
 private slots:
     void populateSkinsMenu();
     void skinsMenuActivated(int);
     void pmViewActivated(int);
     void writem3u();
     void writeCurrentM3u();
     void scanForAudio();
     void scanForVideo();