From 463f4e95cff0e100b4c8c8b5378cfe1b2604c138 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 8 Sep 2019 11:49:28 +0000 Subject: fixed possible regressions git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9068 90c681e8-e032-0410-971d-27865f9a5e38 --- src/qmmpui/groupedcontainer.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src/qmmpui/groupedcontainer.cpp') diff --git a/src/qmmpui/groupedcontainer.cpp b/src/qmmpui/groupedcontainer.cpp index 32e096221..f460c6309 100644 --- a/src/qmmpui/groupedcontainer.cpp +++ b/src/qmmpui/groupedcontainer.cpp @@ -268,20 +268,22 @@ PlayListTrack *GroupedContainer::findTrack(int number) const void GroupedContainer::removeTrack(PlayListTrack *track) { - for(PlayListGroup *group : qAsConst(m_groups)) + QList::iterator it = m_groups.begin(); + while(it != m_groups.end()) { - if(group->contains(track)) + if((*it)->contains(track)) { - group->trackList.removeAll(track); + (*it)->trackList.removeAll(track); m_items.removeAll(track); - if(group->isEmpty()) + if((*it)->isEmpty()) { - m_groups.removeAll(group); - m_items.removeAll(group); - delete group; + m_groups.removeAll(*it); + m_items.removeAll(*it); + delete *it; } return; } + ++it; } } @@ -320,7 +322,7 @@ bool GroupedContainer::move(QList indexes, int from, int to) if(!group) return false; - for(const int &i : qAsConst(indexes)) + for(int i : qAsConst(indexes)) { if(i <= firstIndex || i > lastIndex) return false; -- cgit v1.2.3-13-gbd6f