SongUpdate: remove archive handling from LoadFile()

This code has been moved to LoadFromArchive().

SongUpdate: remove archive handling from LoadFile()
d3ae0550 · Max Kellermann · 96f4394d · d3ae0550
Commit d3ae0550 authored Feb 26, 2016 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 10 deletions

SongUpdate.cxx src/SongUpdate.cxx +1 -10

No files found.
--- 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;
 	}