iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix crash when deleting streams.

Browse Source
This commit is contained in:
craig
2012-02-22 17:29:15 +00:00
committed by craig
parent 199f94b25a
commit c3c7b50072
4 changed files with 59 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gui/streamspage.cpp
View File

@@ -330,23 +330,36 @@ void StreamsPage::removeItems()
#endif
// Ensure that if we have a category selected, we dont also try to remove one of its children
QSet<StreamsModel::Item *> selectedCategories;
QSet<StreamsModel::CategoryItem *> removeCategories;
QList<StreamsModel::StreamItem *> removeStreams;
QModelIndexList remove;
//..obtain catagories to remove...
foreach(QModelIndex index, selected) {
QModelIndex idx=proxy.mapToSource(index);
StreamsModel::Item *item=static_cast<StreamsModel::Item *>(idx.internalPointer());
if (item->isCategory()) {
selectedCategories.insert(item);
remove.append(idx);
} else if (!selectedCategories.contains(static_cast<StreamsModel::StreamItem*>(item)->parent)) {
remove.append(idx);
removeCategories.insert(static_cast<StreamsModel::CategoryItem *>(item));
}
}
// Obtain streams in non-selected categories...
foreach(QModelIndex index, selected) {
QModelIndex idx=proxy.mapToSource(index);
StreamsModel::Item *item=static_cast<StreamsModel::Item *>(idx.internalPointer());
if (!item->isCategory()) {
removeStreams.append(static_cast<StreamsModel::StreamItem *>(item));
}
}
foreach (const QModelIndex &idx, remove) {
model.remove(idx);
foreach (StreamsModel::CategoryItem *i, removeCategories) {
model.removeCategory(i);
}
foreach (StreamsModel::StreamItem *i, removeStreams) {
model.removeStream(i);
}
model.updateGenres();
exportAction->setEnabled(model.rowCount()>0);
}