diff options
| author | 2022-06-15 06:57:23 -0400 | |
|---|---|---|
| committer | 2022-06-15 20:57:23 +1000 | |
| commit | 699630ed167692e6d8d953caadd228bbd87c19aa (patch) | |
| tree | 3b85ee6f8ceb4bcc5e97419206bb89200185faf4 /src/osd/modules/render/bgfx/chainmanager.cpp | |
| parent | fe1e26a9fb437de24661a5cb16f82ec94cdb14fc (diff) | |
osdcore.h: Changed osd_subst_env to accept a std::string_view and return a std::string. (#9928)
Diffstat (limited to 'src/osd/modules/render/bgfx/chainmanager.cpp')
| -rw-r--r-- | src/osd/modules/render/bgfx/chainmanager.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/osd/modules/render/bgfx/chainmanager.cpp b/src/osd/modules/render/bgfx/chainmanager.cpp index afbb7a99500..b9bee6d87a8 100644 --- a/src/osd/modules/render/bgfx/chainmanager.cpp +++ b/src/osd/modules/render/bgfx/chainmanager.cpp @@ -73,8 +73,7 @@ void chain_manager::refresh_available_chains() m_available_chains.clear(); m_available_chains.push_back(chain_desc("none", "")); - std::string chains_path; - osd_subst_env(chains_path, util::string_format("%s" PATH_SEPARATOR "chains", m_options.bgfx_path())); + const std::string chains_path = osd_subst_env(util::string_format("%s" PATH_SEPARATOR "chains", m_options.bgfx_path())); find_available_chains(chains_path, ""); destroy_unloaded_chains(); @@ -151,8 +150,7 @@ bgfx_chain* chain_manager::load_chain(std::string name, uint32_t screen_index) { name = name + ".json"; } - std::string path; - osd_subst_env(path, util::string_format("%s" PATH_SEPARATOR "chains" PATH_SEPARATOR, m_options.bgfx_path())); + std::string path = osd_subst_env(util::string_format("%s" PATH_SEPARATOR "chains" PATH_SEPARATOR, m_options.bgfx_path())); path += name; bx::FileReader reader; |
