Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed bug with ActivePlaylistView were songs we're being removed

correctly. Also incremented VERSION number.
  • Loading branch information...
commit 12e0f88cb9b685a4d1530ae89d8b54cfa747c834 1 parent 6154efc
@klnusbaum authored
View
2  VERSION.cmake
@@ -1,5 +1,5 @@
set( VERSION_MAJOR 0 )
set( VERSION_MINOR 6 )
-set( VERSION_PATCH 1 )
+set( VERSION_PATCH 2 )
set( VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} )
View
11 src/ActivePlaylistView.cpp
@@ -102,16 +102,17 @@ void ActivePlaylistView::handleContextMenuRequest(const QPoint& /*pos*/){
contextMenu.addAction(removeSongAction);
QAction *selected = contextMenu.exec(QCursor::pos());
if(selected==NULL){
- selectionModel()->clear();
+ selectionModel()->clearSelection();
}
}
void ActivePlaylistView::removeSongs(){
- dataStore->removeSongsFromActivePlaylist(
+ QSet<library_song_id_t> toRemove =
Utils::getSelectedIds<library_song_id_t>(
this,
model,
- DataStore::getActivePlaylistLibIdColName()));
+ DataStore::getActivePlaylistLibIdColName());
+ dataStore->removeSongsFromActivePlaylist(toRemove);
selectionModel()->clearSelection();
}
@@ -141,10 +142,6 @@ void ActivePlaylistView::focusOutEvent(QFocusEvent *event){
}
}
-void ActivePlaylistView::focusInEvent(QFocusEvent* /*event*/){
- selectionModel()->clearSelection();
-}
-
} //end namespace
View
3  src/ActivePlaylistView.hpp
@@ -56,9 +56,6 @@ Q_OBJECT
/** \brief . */
void focusOutEvent(QFocusEvent *event);
- /** \brief . */
- void focusInEvent(QFocusEvent *event);
-
//@}
private:
Please sign in to comment.
Something went wrong with that request. Please try again.