File tree Expand file tree Collapse file tree 2 files changed +7
-1
lines changed Expand file tree Collapse file tree 2 files changed +7
-1
lines changed Original file line number Diff line number Diff line change @@ -310,9 +310,14 @@ void ISystem::unmountBuiltins() {
310310
311311 auto removeByKey = [&, this ](const char * s) {
312312 auto range = m_cachedArchiveFiles.findRange (s);
313+ std::vector<core::smart_refctd_ptr<IFileArchive>> items_to_remove = {}; // is it always just 1 item?
313314 for (auto it = range.begin (); it != range.end (); ++it)
314315 {
315- unmount (it->second .get (), s);
316+ items_to_remove.push_back (it->second );
317+ }
318+ for (size_t i = 0 ; i < items_to_remove.size (); i++)
319+ {
320+ m_cachedArchiveFiles.removeObject (items_to_remove[i], s);
316321 }
317322 };
318323 removeByKey (" nbl/builtin" );
Original file line number Diff line number Diff line change @@ -63,6 +63,7 @@ class ShaderCompiler final : public system::IApplicationFramework
6363 m_logger->log (" Unmounting builtins." );
6464 m_system->unmountBuiltins ();
6565 no_nbl_builtins = true ;
66+ m_arguments.erase (m_arguments.begin () + i - 1 );
6667 }
6768 else if (argv[i] == " -Fo" )
6869 {
You can’t perform that action at this time.
0 commit comments