From 0c5d7541353b149098ba913c4622c3d4714a47c1 Mon Sep 17 00:00:00 2001
From: David Sansome <davidsansome@gmail.com>
Date: Sat, 28 Aug 2010 19:17:39 +0000
Subject: [PATCH] Fix the queue manager

---
 src/playlist/queue.cpp        | 2 ++
 src/playlist/queuemanager.cpp | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/playlist/queue.cpp b/src/playlist/queue.cpp
index a21ce1a8c..51d584420 100644
--- a/src/playlist/queue.cpp
+++ b/src/playlist/queue.cpp
@@ -260,8 +260,10 @@ bool Queue::dropMimeData(const QMimeData* data, Qt::DropAction action, int row,
   } else if (data->hasFormat(Playlist::kRowsMimetype)) {
     // Dragged from the playlist
 
+    Playlist* playlist = NULL;
     QList<int> source_rows;
     QDataStream stream(data->data(Playlist::kRowsMimetype));
+    stream >> playlist;
     stream >> source_rows;
 
     QModelIndexList source_indexes;
diff --git a/src/playlist/queuemanager.cpp b/src/playlist/queuemanager.cpp
index 0d501a4ba..99c319949 100644
--- a/src/playlist/queuemanager.cpp
+++ b/src/playlist/queuemanager.cpp
@@ -50,6 +50,7 @@ void QueueManager::SetPlaylistManager(PlaylistManager* manager) {
   playlists_ = manager;
 
   connect(playlists_, SIGNAL(CurrentChanged(Playlist*)), SLOT(CurrentPlaylistChanged(Playlist*)));
+  CurrentPlaylistChanged(playlists_->current());
 }
 
 void QueueManager::CurrentPlaylistChanged(Playlist* playlist) {