aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

better null checking decklist (#2510)

Browse source
This commit is contained in:
Zach H 2017-03-18 20:56:49 -04:00 committed by GitHub
parent 3b2eff2551
commit 212a7d00db
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cockatrice/src/decklistmodel.cpp
View file

@ -300,8 +300,9 @@ QModelIndex DeckListModel::addCard(const QString &cardName, const QString &zoneN
QModelIndex DeckListModel::nodeToIndex(AbstractDecklistNode *node) const QModelIndex DeckListModel::nodeToIndex(AbstractDecklistNode *node) const
{ {
if (node == root) if (node == nullptr || node == root)
return QModelIndex(); return QModelIndex();
return createIndex(node->getParent()->indexOf(node), 0, node); return createIndex(node->getParent()->indexOf(node), 0, node);
} }

2
cockatrice/src/remotedecklist_treewidget.cpp
View file

@ -198,7 +198,7 @@ Qt::ItemFlags RemoteDeckList_TreeModel::flags(const QModelIndex &index) const
QModelIndex RemoteDeckList_TreeModel::nodeToIndex(Node *node) const QModelIndex RemoteDeckList_TreeModel::nodeToIndex(Node *node) const
{ {
if (node == root) if (node == nullptr || node == root)
return QModelIndex(); return QModelIndex();
return createIndex(node->getParent()->indexOf(node), 0, node); return createIndex(node->getParent()->indexOf(node), 0, node);
} }