brian/promoe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix entry removal.

Browse source
This commit is contained in:
Tobias Rundstrom 2006-03-01 22:13:49 -03:00
parent 7436ae5e45
commit c8d095a6f5
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
PlaylistList.cpp
View file

@ -103,11 +103,17 @@ PlaylistList::playlistChanged (QHash<QString,QString> h)
{ {
int pos = h.value("position").toUInt(); int pos = h.value("position").toUInt();
PlaylistItem *i = m_items->value (pos); PlaylistItem *i = m_items->value (pos);
if (!i) { if (!i) {
return; return;
} }
m_items->removeAt (pos); m_items->removeAt (pos);
m_itemmap->remove (i->getID ()); if (!m_items->contains (i)) {
m_itemmap->remove (i->getID ());
delete i;
}
if (m_active) { if (m_active) {
if (m_active > pos) { if (m_active > pos) {
m_active --; m_active --;
@ -116,7 +122,6 @@ PlaylistList::playlistChanged (QHash<QString,QString> h)
} }
} }
delete i;
} }
break; break;
case XMMS_PLAYLIST_CHANGED_MOVE: case XMMS_PLAYLIST_CHANGED_MOVE:
@ -397,8 +402,7 @@ PlaylistList::keyPressEvent (QKeyEvent *event)
{ {
/* Sort list and remove in reverse order */ /* Sort list and remove in reverse order */
qSort (*m_selected); qSort (*m_selected);
for (int i = m_selected->count (); i > 0; i --) { for (int i = m_selected->count () - 1; i >= 0; i --) {
qDebug ("delete pos %d", m_selected->value (i));
xmmsh->playlistRemove (m_selected->value (i)); xmmsh->playlistRemove (m_selected->value (i));
} }
m_selected->clear (); m_selected->clear ();

3
promoe.pro
View file

@ -43,7 +43,8 @@ RESOURCES = promoe.qrc
macx:RC_FILE = promoe.icns macx:RC_FILE = promoe.icns
CONFIG += link_pkgconfig CONFIG += link_pkgconfig
CONFIG += debug warn_on CXXFLAGS += -g
;CONFIG += debug warn_on
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter
PKGCONFIG += xmms2-client xmms2-client-cpp sigc++-2.0 PKGCONFIG += xmms2-client xmms2-client-cpp sigc++-2.0