- don't enable the play button if switching to the playlist tab and the

  playlist is empty
- don't crash when starting to play and no item is selected in the
  playlist. instead select the first item then.

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
@@ -40,16 +40,18 @@ public slots:
   void unSelect();
   void writeCurrent( Config &);
   void setSelectedItem( const QString & );
     bool prev();
     bool next();
     bool first();
     bool last();
 
+    bool isEmpty() const { return childCount() == 0; }
+
 protected:
     virtual void contentsMouseMoveEvent(QMouseEvent *);
 /* #ifdef USE_PLAYLIST_BACKGROUND */
     virtual void drawBackground( QPainter *p, const QRect &r );
     virtual void paintEmptyArea( QPainter *p, const QRect &r ) { drawBackground( p, r ); };
 /* #endif */
 
 private:
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
@@ -413,17 +413,23 @@ void PlayListWidget::setDocument( const QString& fileref ) {
 void PlayListWidget::useSelectedDocument() {
     d->setDocumentUsed = FALSE;
 }
 
 
 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;
 }
 
 
 bool PlayListWidget::prev() {
     if ( mediaPlayerState->isShuffled() ) {
         const DocLnk *cur = current();
         int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0));
         for ( int i = 0; i < j; i++ ) {
@@ -559,16 +565,18 @@ void PlayListWidget::tabChanged(QWidget *) {
     switch ( currentTab() ) {
     case CurrentPlayList:
     {
         if( !tbDeletePlaylist->isHidden() )  {
             tbDeletePlaylist->hide();
         }
         d->tbRemoveFromList->setEnabled(TRUE);
         d->tbAddToList->setEnabled(FALSE);
+
+        d->tbPlay->setEnabled( !d->selectedFiles->isEmpty() );
     }
     break;
     case AudioFiles:
     {
       //        audioView->clear();
         if(!audioPopulated) populateAudioView();
 
         if( !tbDeletePlaylist->isHidden() ) {