Skip to content

Commit d28cf2a

Browse files
committed
LP-567 fix spurious Settings node expand when selecting a Data item
was due a regression in the parent() method
1 parent 0a40850 commit d28cf2a

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

ground/gcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,11 +295,10 @@ QModelIndex UAVObjectTreeModel::parent(const QModelIndex &index) const
295295
return QModelIndex();
296296
}
297297

298-
TreeItem *item = static_cast<TreeItem *>(index.internalPointer());
298+
TreeItem *childItem = static_cast<TreeItem *>(index.internalPointer());
299+
TreeItem *parentItem = childItem->parent();
299300

300-
TreeItem *parentItem = item->parent();
301-
if (!parentItem) {
302-
// item is root has no parent...
301+
if (parentItem == m_rootItem) {
303302
return QModelIndex();
304303
}
305304

0 commit comments

Comments
 (0)