mirrors/Atmosphere
0
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-08-11 18:50:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

lr: lr_manager tweaks

Browse source
This commit is contained in:
Adubbz 2019-08-15 18:17:01 +10:00
commit 8278bda54e
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
stratosphere/libstratosphere/include/stratosphere/ipc/ipc_domain_object.hpp
View file

@ -127,4 +127,8 @@ class Out<std::shared_ptr<ServiceImpl>> : public OutSessionTag {
void SetValue(std::shared_ptr<ServiceImpl> &&s) { void SetValue(std::shared_ptr<ServiceImpl> &&s) {
*this->srv = std::move(s); *this->srv = std::move(s);
} }
void SetValue(std::shared_ptr<ServiceImpl> &s) {
*this->srv = s;
}
}; };

16
stratosphere/ncm/source/impl/lr_manager.cpp
View file

@ -41,11 +41,10 @@ namespace sts::lr::impl {
R_TRY(content_resolver->Refresh()); R_TRY(content_resolver->Refresh());
g_location_resolvers[storage_id] = std::move(content_resolver); g_location_resolvers[storage_id] = std::move(content_resolver);
} }
resolver = g_location_resolvers.Find(storage_id);
} }
/* Make a copy of the resolver for output. */ out.SetValue(*resolver);
auto tmp_resolver = g_location_resolvers[storage_id];
out.SetValue(std::move(tmp_resolver));
return ResultSuccess; return ResultSuccess;
} }
@ -56,9 +55,7 @@ namespace sts::lr::impl {
g_registered_location_resolver = std::make_shared<RegisteredLocationResolverInterface>(); g_registered_location_resolver = std::make_shared<RegisteredLocationResolverInterface>();
} }
/* Make a copy of the resolver for output. */ out.SetValue(g_registered_location_resolver);
auto tmp_resolver = g_registered_location_resolver;
out.SetValue(std::move(tmp_resolver));
return ResultSuccess; return ResultSuccess;
} }
@ -70,7 +67,10 @@ namespace sts::lr::impl {
return ResultLrUnknownStorageId; return ResultLrUnknownStorageId;
} }
if (storage_id != ncm::StorageId::Host) {
(*resolver)->Refresh(); (*resolver)->Refresh();
}
return ResultSuccess; return ResultSuccess;
} }
@ -81,9 +81,7 @@ namespace sts::lr::impl {
g_add_on_content_location_resolver = std::make_shared<AddOnContentLocationResolverInterface>(); g_add_on_content_location_resolver = std::make_shared<AddOnContentLocationResolverInterface>();
} }
/* Make a copy of the resolver for output. */ out.SetValue(g_add_on_content_location_resolver);
auto tmp_resolver = g_add_on_content_location_resolver;
out.SetValue(std::move(tmp_resolver));
return ResultSuccess; return ResultSuccess;
} }