2 files changed, 11 insertions, 1 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistselection.h b/noncore/multimedia/opieplayer2/playlistselection.h
index d10bc82..9cc4e30 100644
--- a/noncore/multimedia/opieplayer2/playlistselection.h
+++ b/noncore/multimedia/opieplayer2/playlistselection.h
@@ -46,4 +46,6 @@ public slots:
     bool last();
 
+    bool isEmpty() const { return childCount() == 0; }
+
 protected:
     virtual void contentsMouseMoveEvent(QMouseEvent *);
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index f53def6..b08204e 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -419,5 +419,11 @@ const DocLnk *PlayListWidget::current() const { // this is fugly
     assert( currentTab() == CurrentPlayList );
 
-    return d->selectedFiles->current();
+    const DocLnk *lnk = d->selectedFiles->current();
+    if ( !lnk ) {
+        d->selectedFiles->first();
+        lnk = d->selectedFiles->current();
+    }
+    assert( lnk );
+    return lnk;
 }
 
@@ -565,4 +571,6 @@ void PlayListWidget::tabChanged(QWidget *) {
         d->tbRemoveFromList->setEnabled(TRUE);
         d->tbAddToList->setEnabled(FALSE);
+
+        d->tbPlay->setEnabled( !d->selectedFiles->isEmpty() );
     }
     break;