From 75b847132afb75d50b3c7041f298fb4372ccd1c2 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 17 Jan 2014 23:49:53 +0100
Subject: [PATCH] QueueSave: use DatabaseDetachSong()

---
 src/QueueSave.cxx | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/QueueSave.cxx b/src/QueueSave.cxx
index 30dae37e3..601d3519a 100644
--- a/src/QueueSave.cxx
+++ b/src/QueueSave.cxx
@@ -23,8 +23,7 @@
 #include "PlaylistError.hxx"
 #include "DetachedSong.hxx"
 #include "SongSave.hxx"
-#include "DatabasePlugin.hxx"
-#include "DatabaseGlue.hxx"
+#include "DatabaseSong.hxx"
 #include "fs/TextFile.hxx"
 #include "util/StringUtil.hxx"
 #include "util/UriUtil.hxx"
@@ -111,16 +110,9 @@ queue_load_song(TextFile &file, const char *line, queue &queue)
 		if (uri_has_scheme(uri)) {
 			song = new DetachedSong(uri);
 		} else {
-			const Database *db = GetDatabase();
-			if (db == nullptr)
+			song = DatabaseDetachSong(uri, IgnoreError());
+			if (song == nullptr)
 				return;
-
-			Song *tmp = db->GetSong(uri, IgnoreError());
-			if (tmp == nullptr)
-				return;
-
-			song = new DetachedSong(*tmp);
-			db->ReturnSong(tmp);
 		}
 	}