avoid keep adding songs on playlist clear

derselbst · Jan 28, 2018 · 718988e · 718988e
1 parent c4bf609
commit 718988e
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/gui/PlaylistModel.cpp b/gui/PlaylistModel.cpp
@@ -23,6 +23,7 @@ PlaylistModel::PlaylistModel(QObject *parent)
 PlaylistModel::~PlaylistModel()
 {
     this->songsToAdd.shutDown=true;
+    this->songsToAdd.queue.clear();
 
     try
     {
@@ -414,10 +415,15 @@ void PlaylistModel::remove(size_t i)
 
 void PlaylistModel::clear()
 {
+    {
+    std::unique_lock<mutex> lck(this->songsToAdd.mtx);
+    this->songsToAdd.queue.clear();
+//     emit this->SongAdded("", 0, 0);
+    }
+
     lock_guard<recursive_mutex> lck(this->mtx);
 
     const int Elements = this->rowCount(QModelIndex());
-
     this->removeRows(0, Elements);
 }