Эх сурвалжийг харах

Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into alpha41/maskMadness

AzaezelX 7 сар өмнө
parent
commit
677c061bc9

+ 1 - 1
Engine/source/gui/editor/inspector/field.cpp

@@ -233,7 +233,7 @@ void GuiInspectorField::setFirstResponder( GuiControl *firstResponder )
 {
 {
    Parent::setFirstResponder( firstResponder );
    Parent::setFirstResponder( firstResponder );
 
 
-   if (( firstResponder == this || firstResponder == mEdit ) && firstResponder->isProperlyAdded())
+   if (( firstResponder == this || firstResponder == mEdit ) && (firstResponder && firstResponder->isProperlyAdded()))
    {
    {
       mInspector->setHighlightField( this );      
       mInspector->setHighlightField( this );      
    }   
    }