Avoid dereference after null check

fix/skillcap
Andrei Kortunov 6 years ago
parent 1c13256456
commit a08048da4e

@ -82,7 +82,7 @@ namespace MWGui
dialog->eventOkClicked.clear();
dialog->eventOkClicked += MyGUI::newDelegate(this, &ContainerWindow::dragItem);
}
else
else if (mModel)
dragItem (NULL, count);
}

@ -898,7 +898,8 @@ namespace MWGui
mKeyboardNavigation->onFrame();
mMessageBoxManager->onFrame(frameDuration);
if (mMessageBoxManager)
mMessageBoxManager->onFrame(frameDuration);
mToolTips->onFrame(frameDuration);

@ -1180,9 +1180,9 @@ namespace MWWorld
addContainerScripts (getPlayerPtr(), newCell);
newPtr = getPlayerPtr();
}
else
else if (currCell)
{
bool currCellActive = currCell && mWorldScene->isCellActive(*currCell);
bool currCellActive = mWorldScene->isCellActive(*currCell);
bool newCellActive = newCell && mWorldScene->isCellActive(*newCell);
if (!currCellActive && newCellActive)
{

Loading…
Cancel
Save