SongUpdate: remove archive handling from LoadFile()

This code has been moved to LoadFromArchive().
This commit is contained in:
Max Kellermann 2016-02-26 15:01:53 +01:00
parent 96f4394dce
commit d3ae05506d

View File

@ -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;
}