Diffstat (limited to 'noncore/multimedia/opieplayer2/playlistwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 55b66ab..6355bec 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -166,15 +166,12 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
166 | QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default"); | 166 | QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default"); |
167 | loadList(DocLnk( currentPlaylist ) ); | 167 | loadList(DocLnk( currentPlaylist ) ); |
168 | } | 168 | } |
169 | 169 | ||
170 | 170 | ||
171 | PlayListWidget::~PlayListWidget() { | 171 | PlayListWidget::~PlayListWidget() { |
172 | if ( d->current ) { | ||
173 | delete d->current; | ||
174 | } | ||
175 | delete d; | 172 | delete d; |
176 | } | 173 | } |
177 | 174 | ||
178 | 175 | ||
179 | void PlayListWidget::initializeStates() { | 176 | void PlayListWidget::initializeStates() { |
180 | d->tbPlay->setOn( mediaPlayerState->isPlaying() ); | 177 | d->tbPlay->setOn( mediaPlayerState->isPlaying() ); |
@@ -425,16 +422,14 @@ void PlayListWidget::useSelectedDocument() { | |||
425 | 422 | ||
426 | 423 | ||
427 | const DocLnk *PlayListWidget::current() const { // this is fugly | 424 | const DocLnk *PlayListWidget::current() const { // this is fugly |
428 | assert( currentTab() == CurrentPlayList ); | 425 | assert( currentTab() == CurrentPlayList ); |
429 | 426 | ||
430 | // qDebug("playlist"); | 427 | // qDebug("playlist"); |
431 | if ( mediaPlayerState->isUsingPlaylist() ) { | 428 | if ( mediaPlayerState->isUsingPlaylist() ) |
432 | return d->selectedFiles->current(); | 429 | return d->selectedFiles->current(); |
433 | } else if ( d->setDocumentUsed && d->current ) | ||
434 | return d->current; | ||
435 | 430 | ||
436 | assert( false ); | 431 | assert( false ); |
437 | } | 432 | } |
438 | 433 | ||
439 | 434 | ||
440 | bool PlayListWidget::prev() { | 435 | bool PlayListWidget::prev() { |