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() {
310
310
311
311
auto removeByKey = [&, this ](const char * s) {
312
312
auto range = m_cachedArchiveFiles.findRange (s);
313
+ std::vector<core::smart_refctd_ptr<IFileArchive>> items_to_remove = {}; // is it always just 1 item?
313
314
for (auto it = range.begin (); it != range.end (); ++it)
314
315
{
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);
316
321
}
317
322
};
318
323
removeByKey (" nbl/builtin" );
Original file line number Diff line number Diff line change @@ -63,6 +63,7 @@ class ShaderCompiler final : public system::IApplicationFramework
63
63
m_logger->log (" Unmounting builtins." );
64
64
m_system->unmountBuiltins ();
65
65
no_nbl_builtins = true ;
66
+ m_arguments.erase (m_arguments.begin () + i - 1 );
66
67
}
67
68
else if (argv[i] == " -Fo" )
68
69
{
You can’t perform that action at this time.
0 commit comments