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

DRTVWR-494: Avoid keeping iterator to destroyed temporary container.

master
Nat Goodspeed 2019-12-18 12:27:05 -05:00
parent 632782e7ef
commit a851a0c130
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llwindow/llwindow.cpp
View File

@ -457,9 +457,8 @@ LLCoordCommon LL_COORD_TYPE_WINDOW::convertToCommon() const
{
const LLCoordWindow& self = LLCoordWindow::getTypedCoords(*this);
auto windowit = LLWindow::instance_snapshot().begin();
LLCoordGL out;
windowit->convertCoords(self, &out);
LLWindow::instance_snapshot().begin()->convertCoords(self, &out);
return out.convert();
}
@ -467,18 +466,16 @@ void LL_COORD_TYPE_WINDOW::convertFromCommon(const LLCoordCommon& from)
{
LLCoordWindow& self = LLCoordWindow::getTypedCoords(*this);
auto windowit = LLWindow::instance_snapshot().begin();
LLCoordGL from_gl(from);
windowit->convertCoords(from_gl, &self);
LLWindow::instance_snapshot().begin()->convertCoords(from_gl, &self);
}
LLCoordCommon LL_COORD_TYPE_SCREEN::convertToCommon() const
{
const LLCoordScreen& self = LLCoordScreen::getTypedCoords(*this);
auto windowit = LLWindow::instance_snapshot().begin();
LLCoordGL out;
windowit->convertCoords(self, &out);
LLWindow::instance_snapshot().begin()->convertCoords(self, &out);
return out.convert();
}
@ -486,7 +483,6 @@ void LL_COORD_TYPE_SCREEN::convertFromCommon(const LLCoordCommon& from)
{
LLCoordScreen& self = LLCoordScreen::getTypedCoords(*this);
auto windowit = LLWindow::instance_snapshot().begin();
LLCoordGL from_gl(from);
windowit->convertCoords(from_gl, &self);
LLWindow::instance_snapshot().begin()->convertCoords(from_gl, &self);
}