瀏覽代碼

Merge branch 'ctkDICOMModelTest2-assert'

* ctkDICOMModelTest2-assert:
  Asking for the parent of an invalid index is valid
Julien Finet 14 年之前
父節點
當前提交
d818e07f15
共有 1 個文件被更改,包括 4 次插入0 次删除
  1. 4 0
      Libs/DICOM/Core/ctkDICOMModel.cpp

+ 4 - 0
Libs/DICOM/Core/ctkDICOMModel.cpp

@@ -613,6 +613,10 @@ QModelIndex ctkDICOMModel::index ( int row, int column, const QModelIndex & pare
 QModelIndex ctkDICOMModel::parent ( const QModelIndex & indexValue ) const
 {
   Q_D(const ctkDICOMModel);
+  if (!indexValue.isValid())
+    {
+    return QModelIndex();
+    }
   Node* node = d->nodeFromIndex(indexValue);
   Q_ASSERT(node);
   Node* parentNode = node->Parent;