livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-15356: Crash fix in fast timers: mTimeBlock might be null

Ansariel 2015-01-21 13:52:46 +01:00
parent 7dad1bdad3
commit 7976d9e000
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llfasttimerview.cpp
View File

@ -269,7 +269,10 @@ BOOL LLFastTimerView::handleHover(S32 x, S32 y, MASK mask)
{
break;
}
if (bar.mSelfEnd > mouse_time_offset)
// <FS:Ansariel> FIRE-15356: mTimeBlock might be null
//if (bar.mSelfEnd > mouse_time_offset)
if (bar.mSelfEnd > mouse_time_offset && bar.mTimeBlock)
// </FS:Ansariel>
{
hover_bar = &bar;
if (bar.mTimeBlock->getTreeNode().mCollapsed)