teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Avoid out of range exceptions.

Browse source
This commit is contained in:
cc9cii 2014-10-09 07:01:18 +11:00
parent 70fd531722
commit 13f028e27b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/model/world/idtable.cpp
View file

@ -29,7 +29,7 @@ int CSMWorld::IdTable::columnCount (const QModelIndex & parent) const
QVariant CSMWorld::IdTable::data (const QModelIndex & index, int role) const QVariant CSMWorld::IdTable::data (const QModelIndex & index, int role) const
{ {
if (role!=Qt::DisplayRole && role!=Qt::EditRole) if ((role!=Qt::DisplayRole && role!=Qt::EditRole) || index.row() < 0 || index.column() < 0)
return QVariant(); return QVariant();
if (role==Qt::EditRole && !mIdCollection->getColumn (index.column()).isEditable()) if (role==Qt::EditRole && !mIdCollection->getColumn (index.column()).isEditable())

2
apps/opencs/view/render/pagedworldspacewidget.cpp
View file

@ -50,7 +50,7 @@ bool CSVRender::PagedWorldspaceWidget::adjustCells()
{ {
int index = cells.searchId (iter->getId (mWorldspace)); int index = cells.searchId (iter->getId (mWorldspace));
if (index!=0 && cells.getRecord (index).mState!=CSMWorld::RecordBase::State_Deleted && if (index > 0 && cells.getRecord (index).mState!=CSMWorld::RecordBase::State_Deleted &&
mCells.find (*iter)==mCells.end()) mCells.find (*iter)==mCells.end())
{ {
if (setCamera) if (setCamera)