diff options
Diffstat (limited to 'src/SongLoader.cxx')
| -rw-r--r-- | src/SongLoader.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/SongLoader.cxx b/src/SongLoader.cxx index e66e60e70..5ea8df80c 100644 --- a/src/SongLoader.cxx +++ b/src/SongLoader.cxx @@ -54,17 +54,15 @@ SongLoader::LoadFile(const char *path_utf8, Error &error) const } #endif - if (client != nullptr) { - const auto path_fs = AllocatedPath::FromUTF8(path_utf8, error); - if (path_fs.IsNull()) - return nullptr; + const auto path_fs = AllocatedPath::FromUTF8(path_utf8, error); + if (path_fs.IsNull()) + return nullptr; - if (!client->AllowFile(path_fs, error)) - return nullptr; - } + if (client != nullptr && !client->AllowFile(path_fs, error)) + return nullptr; DetachedSong *song = new DetachedSong(path_utf8); - if (!song->Update()) { + if (!song->LoadFile(path_fs)) { error.Set(playlist_domain, int(PlaylistResult::NO_SUCH_SONG), "No such file"); delete song; |