TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #556 from camporter/mfield_null_check

Browse source 
When setting the field on a GuiInspectorField, check if the field is null before setting the docs
This commit is contained in:
Thomas Fischer 2014-03-14 20:52:12 +01:00
commit 317a2cb73d
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Engine/source/gui/editor/inspector/field.cpp
View file

@ -58,7 +58,7 @@ GuiInspectorField::GuiInspectorField( GuiInspector* inspector,
setCanSave( false ); setCanSave( false );
setBounds(0,0,100,18); setBounds(0,0,100,18);
if( field ) if( field != NULL )
_setFieldDocs( field->pFieldDocs ); _setFieldDocs( field->pFieldDocs );
} }
@ -378,8 +378,9 @@ void GuiInspectorField::setInspectorField( AbstractClassRep::Field *field, Strin
mCaption = getFieldName(); mCaption = getFieldName();
else else
mCaption = caption; mCaption = caption;
_setFieldDocs( mField->pFieldDocs ); if ( mField != NULL )
_setFieldDocs( mField->pFieldDocs );
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------