Skip to content

Commit 4199165

Browse files
committed
correctly reports LuaComponents and LuaUserDataObjects without associated LuaState
1 parent 4cc4bd4 commit 4199165

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

Source/LuaMachine/Private/LuaState.cpp

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,16 +439,24 @@ void ULuaState::FromLuaValue(FLuaValue& LuaValue, UObject* CallContext, lua_Stat
439439
NewUObject(LuaValue.Object);
440440
if (ULuaComponent* LuaComponent = Cast<ULuaComponent>(LuaValue.Object))
441441
{
442+
if (!LuaComponent->LuaState)
443+
{
444+
UE_LOG(LogLuaMachine, Warning, TEXT("%s has no associated LuaState"), *LuaComponent->GetFullName());
445+
}
442446
// ensure we are in the same LuaState
443-
if (LuaComponent->LuaState == GetClass())
447+
else if (LuaComponent->LuaState == GetClass())
444448
{
445449
SetupAndAssignUserDataMetatable(LuaComponent, LuaComponent->Metatable);
446450
}
447451
}
448452
else if (ULuaUserDataObject* LuaUserDataObject = Cast<ULuaUserDataObject>(LuaValue.Object))
449453
{
454+
if (!LuaUserDataObject->GetLuaState())
455+
{
456+
UE_LOG(LogLuaMachine, Warning, TEXT("%s has no associated LuaState"), *LuaUserDataObject->GetFullName());
457+
}
450458
// ensure we are in the same LuaState
451-
if (LuaUserDataObject->GetLuaState() == GetClass())
459+
else if (LuaUserDataObject->GetLuaState() == GetClass())
452460
{
453461
SetupAndAssignUserDataMetatable(LuaUserDataObject, LuaUserDataObject->Metatable);
454462
}

0 commit comments

Comments
 (0)