evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix crash with asset scripts that only manifested after MSVC update

Browse Source
This commit is contained in:
Kae 2024-06-03 18:28:51 +10:00
parent 5d1e85b241
commit 5a99d7b245
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/base/StarAssets.cpp
View File

@ -151,7 +151,7 @@ Assets::Assets(Settings settings, StringList assetSources) {
// re-add the assets callbacks with more functions // re-add the assets callbacks with more functions
context.remove("assets"); context.remove("assets");
auto callbacks = makeBaseAssetCallbacks(); auto callbacks = makeBaseAssetCallbacks();
callbacks.registerCallback("add", [&newFiles](LuaEngine& engine, String const& path, LuaValue const& data) { callbacks.registerCallback("add", [newFiles](LuaEngine& engine, String const& path, LuaValue const& data) {
ByteArray bytes; ByteArray bytes;
if (auto str = engine.luaMaybeTo<String>(data)) if (auto str = engine.luaMaybeTo<String>(data))
bytes = ByteArray(str->utf8Ptr(), str->utf8Size()); bytes = ByteArray(str->utf8Ptr(), str->utf8Size());
@ -165,7 +165,7 @@ Assets::Assets(Settings settings, StringList assetSources) {
newFiles->set(path, bytes); newFiles->set(path, bytes);
}); });
callbacks.registerCallback("patch", [this, &newFiles](String const& path, String const& patchPath) -> bool { callbacks.registerCallback("patch", [this, newFiles](String const& path, String const& patchPath) -> bool {
if (auto file = m_files.ptr(path)) { if (auto file = m_files.ptr(path)) {
if (newFiles->contains(patchPath)) { if (newFiles->contains(patchPath)) {
file->patchSources.append(make_pair(patchPath, newFiles)); file->patchSources.append(make_pair(patchPath, newFiles));