Commit 7ca04196 authored by Lázár Bence Kis's avatar Lázár Bence Kis
Browse files

Fix loader: account for files to be loaded directly from the root of 'data'

parent bc2ff507

lfs/src/loader.cpp

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ namespace lfs { 


Loader::Request::Request(com::Folder* const folder, std::string const& name)

    : disk_path{ osi::data()->dir() }

    , ctx_path{ folder->path(data_root()) }

    , ctx_path{ folder == data_root() ? com::ContextPath{} : folder->path(data_root()) }

{

    ctx_path.push_back(name);

    for (std::string const& path_elem : ctx_path)
@@ -76,7 +76,7 @@ ResourceHandle* Loader::load(com::ContextPath const& path_name, bool const top_p 
ResourceHandle* Loader::load(std::string const& name, com::ContextPath const& path, bool const top_priority)

{

    com::Folder* const f = data_root()->push_back_folders(path);

    ASSUMPTION(f->is_under(data_root()));

    ASSUMPTION(f == data_root() || f->is_under(data_root()));

    com::ContextItem* const item = f->find(name);

    if (item == nullptr)

    {