From d3ae05506d50e9e40562911c4d2c48fc4ec5a1bc Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 26 Feb 2016 15:01:53 +0100
Subject: SongUpdate: remove archive handling from LoadFile()

This code has been moved to LoadFromArchive().
---
 src/SongUpdate.cxx | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'src/SongUpdate.cxx')

diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx
index 71e5ba3b1..6bcfe344b 100644
--- a/src/SongUpdate.cxx
+++ b/src/SongUpdate.cxx
@@ -51,16 +51,7 @@ Song::LoadFile(Storage &storage, const char *path_utf8, Directory &parent)
 	assert(strchr(path_utf8, '\n') == nullptr);
 
 	Song *song = NewFile(path_utf8, parent);
-
-	//in archive ?
-	bool success =
-#ifdef ENABLE_ARCHIVE
-		parent.device == DEVICE_INARCHIVE
-		? song->UpdateFileInArchive(storage)
-		:
-#endif
-		song->UpdateFile(storage);
-	if (!success) {
+	if (!song->UpdateFile(storage)) {
 		song->Free();
 		return nullptr;
 	}
-- 
cgit v1.2.3