┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Penz <[email protected]>2012-05-26 21:59:07 +0200
committerPeter Penz <[email protected]>2012-05-26 22:01:37 +0200
commit276100dcecf19b8037d4da37109c1f8fe6d85459 (patch)
treedb657b76afb4f88a58a353534f697b1f049c67d6
parenta5c25d2de5c05f2aa30c02493b7f7f35942d3d03 (diff)
Fix triggering of Q_ASSERT in PlacesItemModel
Check the group-type of an item to decide whether the item should be inserted as device or not. BUG: 300671 FIXED-IN: 4.9.0
-rw-r--r--src/panels/places/placesitemmodel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp
index ca79acb95..bc9975c47 100644
--- a/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@@ -602,10 +602,10 @@ void PlacesItemModel::loadBookmarks()
QList<PlacesItem*> devicesItems;
while (!bookmark.isNull()) {
- const bool deviceAvailable = devices.remove(bookmark.metaDataItem("UDI"));
if (acceptBookmark(bookmark)) {
PlacesItem* item = new PlacesItem(bookmark);
- if (deviceAvailable) {
+ if (item->groupType() == PlacesItem::DevicesType) {
+ devices.remove(item->udi());
devicesItems.append(item);
} else {
const KUrl url = bookmark.url();