Merge pull request from peace-maker/optional_natives

Keep optional natives optional after reloading
This commit is contained in:
David Anderson 2016-07-26 12:59:32 -07:00 committed by GitHub
commit 61e958e679
2 changed files with 3 additions and 1 deletions

View File

@ -73,7 +73,7 @@ void CNativeOwner::UnbindWeakRef(const WeakNative &ref)
pContext->GetRuntime()->UpdateNativeBinding(
ref.idx,
nullptr,
0,
SP_NTVFLAG_OPTIONAL,
nullptr);
}

View File

@ -341,6 +341,8 @@ void ShareSystem::BindNativeToPlugin(CPlugin *pPlugin, const sp_native_t *native
/* The native is optional, this is a special case */
if ((native->flags & SP_NTVFLAG_OPTIONAL) == SP_NTVFLAG_OPTIONAL)
{
flags |= SP_NTVFLAG_OPTIONAL;
/* Only add if there is a valid owner. */
if (!pEntry->owner)
return;