From 76b31b99f023df45cf90dcc9daf92a9cd6606eb7 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Thu, 15 Aug 2013 18:04:58 +0000 Subject: fixed hal, udisks, udisks2 plugins git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3607 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/udisks2/udisks2plugin.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/plugins/General/udisks2') diff --git a/src/plugins/General/udisks2/udisks2plugin.cpp b/src/plugins/General/udisks2/udisks2plugin.cpp index bfee228d8..9024161bb 100644 --- a/src/plugins/General/udisks2/udisks2plugin.cpp +++ b/src/plugins/General/udisks2/udisks2plugin.cpp @@ -211,9 +211,13 @@ UDisks2Device *UDisks2Plugin::findDevice(QAction *action) void UDisks2Plugin::addPath(const QString &path) { - foreach(PlayListTrack *item, PlayListManager::instance()->selectedPlayList()->items()) // Is it already exist? + PlayListModel *model = PlayListManager::instance()->selectedPlayList(); + + foreach(PlayListItem *item, model->items()) // Is it already exist? { - if (item->url().startsWith(path)) + if(item->isGroup()) + continue; + if (dynamic_cast(item)->url().startsWith(path)) return; } @@ -237,8 +241,8 @@ void UDisks2Plugin::removePath(const QString &path) int i = 0; while (model->count() > 0 && i < model->count()) { - if (model->item(i)->url().startsWith(path)) - model->removeAt (i); + if (model->isTrack(i) && model->track(i)->url().startsWith(path)) + model->removeTrack(i); else ++i; } -- cgit v1.2.3-13-gbd6f