-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 7 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidgetgui.h | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index b04fe8d..55b66ab 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -429,13 +429,12 @@ const DocLnk *PlayListWidget::current() const { // this is fugly | |||
429 | 429 | ||
430 | // qDebug("playlist"); | 430 | // qDebug("playlist"); |
431 | if ( mediaPlayerState->isUsingPlaylist() ) { | 431 | if ( mediaPlayerState->isUsingPlaylist() ) { |
432 | return d->selectedFiles->current(); | 432 | return d->selectedFiles->current(); |
433 | } else if ( d->setDocumentUsed && d->current ) { | 433 | } else if ( d->setDocumentUsed && d->current ) |
434 | return d->current; | 434 | return d->current; |
435 | } else { | 435 | |
436 | return &(d->files->selectedDocument()); | 436 | assert( false ); |
437 | } | ||
438 | } | 437 | } |
439 | 438 | ||
440 | 439 | ||
441 | bool PlayListWidget::prev() { | 440 | bool PlayListWidget::prev() { |
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.h b/noncore/multimedia/opieplayer2/playlistwidgetgui.h index 61fd40d..6c35771 100644 --- a/noncore/multimedia/opieplayer2/playlistwidgetgui.h +++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.h | |||
@@ -61,9 +61,8 @@ class QLabel; | |||
61 | class PlayListWidgetPrivate { | 61 | class PlayListWidgetPrivate { |
62 | public: | 62 | public: |
63 | QToolButton *tbPlay, *tbFull, *tbLoop, *tbShuffle, *tbAddToList, *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove; | 63 | QToolButton *tbPlay, *tbFull, *tbLoop, *tbShuffle, *tbAddToList, *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove; |
64 | QFrame *playListFrame; | 64 | QFrame *playListFrame; |
65 | FileSelector *files; | ||
66 | PlayListSelection *selectedFiles; | 65 | PlayListSelection *selectedFiles; |
67 | bool setDocumentUsed; | 66 | bool setDocumentUsed; |
68 | DocLnk *current; | 67 | DocLnk *current; |
69 | }; | 68 | }; |