mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-22 22:09:44 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fixbadcast' into 'master'

Browse source 
Fix std::bad_cast

Closes #6217

See merge request OpenMW/openmw!1130
This commit is contained in:
psi29a 2021-08-20 20:36:44 +00:00
commit d09c807a40
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/opencs/model/world/commanddispatcher.cpp
View file

@ -3,6 +3,9 @@
#include <algorithm> #include <algorithm>
#include <memory> #include <memory>
#include <QAbstractItemModel>
#include <QAbstractProxyModel>
#include <components/misc/stringops.hpp> #include <components/misc/stringops.hpp>
#include <components/misc/constants.hpp> #include <components/misc/constants.hpp>
@ -147,13 +150,16 @@ void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *model, cons
std::unique_ptr<CSMWorld::ModifyCommand> modifyData; std::unique_ptr<CSMWorld::ModifyCommand> modifyData;
std::unique_ptr<CSMWorld::UpdateCellCommand> modifyCell; std::unique_ptr<CSMWorld::UpdateCellCommand> modifyCell;
int columnId = model->data (index, ColumnBase::Role_ColumnId).toInt(); QAbstractItemModel* sourceModel = model;
if (IdTableProxyModel* proxy = dynamic_cast<IdTableProxyModel*> (model))
sourceModel = proxy->sourceModel();
int stateColumn = dynamic_cast<CSMWorld::IdTable&>(*model).findColumnIndex(Columns::ColumnId_Modification); CSMWorld::IdTable& table = dynamic_cast<CSMWorld::IdTable&>(*sourceModel); // for getId()
int stateColumn = table.findColumnIndex(Columns::ColumnId_Modification);
CSMWorld::IdTable& table = dynamic_cast<CSMWorld::IdTable&>(*model); // for getId()
QModelIndex stateIndex = table.getModelIndex(table.getId(index.row()), stateColumn); QModelIndex stateIndex = table.getModelIndex(table.getId(index.row()), stateColumn);
RecordBase::State state = static_cast<RecordBase::State> (model->data(stateIndex).toInt()); RecordBase::State state = static_cast<RecordBase::State> (sourceModel->data(stateIndex).toInt());
int columnId = model->data (index, ColumnBase::Role_ColumnId).toInt();
// This is not guaranteed to be the same as \a model, since a proxy could be used. // This is not guaranteed to be the same as \a model, since a proxy could be used.
IdTable& model2 = dynamic_cast<IdTable&> (*mDocument.getData().getTableModel(mId)); IdTable& model2 = dynamic_cast<IdTable&> (*mDocument.getData().getTableModel(mId));