Commit 39523ee3 authored by Michael Pyne's avatar Michael Pyne

Merge remote-tracking branch 'origin/Applications/17.12'

Conflicts:
	CMakeLists.txt
parents bbc8d9d8 e8c2dbbf
......@@ -149,11 +149,9 @@ void DynamicPlaylist::updateItems()
for(PlaylistList::ConstIterator it = m_playlists.constBegin(); it != m_playlists.constEnd(); ++it)
siblings += (*it)->items();
PlaylistItemList newSiblings = siblings;
if(m_siblings != newSiblings) {
m_siblings = newSiblings;
QTimer::singleShot(0, this, SLOT(slotUpdateItems()));
if(m_siblings != siblings) {
m_siblings = siblings;
slotUpdateItems();
}
}
......
Markdown is supported
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