Commit 065fd08c authored by Matěj Laitl's avatar Matěj Laitl
Browse files

PlaylistActions: when enabling dynamic, clear sorting and populate

BUGFIXES:
 * When turning dynamic playlist on, immediately populate playlist and clear
   any possible playlist sorting.

BUG: 220558
FIXED-IN: 2.6
parent 2cb5e7c1
......@@ -83,6 +83,8 @@ VERSION 2.6-Beta 1
"1.2 GB free" is shown instead of "85% used"; thicker capacity bar.
BUGFIXES:
* When turning dynamic playlist on, immediately populate playlist and clear
any possible playlist sorting. (BR 220558)
* Fix transcoding with ffmpeg >= 0.10; patch by Julian Simioni.
* Fix crash on start when Qt is build with debugging assertions. (BR 285720)
* Fix URLs in MP3tunes, gpodder.net and Last.fm config dialogs. (BR 299088)
......
......@@ -256,14 +256,18 @@ Playlist::Actions::enableDynamicMode( bool enable )
// TODO: should we restore the state of other modes?
AmarokConfig::self()->writeConfig();
//if the playlist is empty, repopulate while we are at it:
if( enable )
{
if ( Playlist::ModelStack::instance()->bottom()->rowCount() == 0 )
repopulateDynamicPlaylist();
}
Playlist::Dock *dock = The::mainWindow()->playlistDock();
Playlist::SortWidget *sorting = dock ? dock->sortWidget() : 0;
if( sorting )
sorting->trimToLevel();
playlistModeChanged();
/* append upcoming tracks to satisfy user's with about number of upcoming tracks.
* Needs to be _after_ playlistModeChanged() because before calling it the old
* m_navigator still reigns. */
if( enable )
normalizeDynamicPlaylist();
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment