gui/models: handle Qt calling DictSyncTreeSepModel.index with garbage…

… inputs. Closes #388
m-labs · Apr 11, 2016 · 9361900 · 9361900
1 parent e7d448e
commit 9361900
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/artiq/gui/models.py b/artiq/gui/models.py
@@ -252,13 +252,24 @@ def headerData(self, col, orientation, role):
         return None
 
     def index(self, row, column, parent):
+        if column >= len(self.headers):
+            return QtCore.QModelIndex()
         if parent.isValid():
             parent_item = parent.internalPointer()
-            return self.createIndex(row, column,
-                                    parent_item.children_by_row[row])
+            try:
+                child = parent_item.children_by_row[row]
+            except IndexError:
+                # This can happen when the last row is selected
+                # and then deleted; Qt will attempt to select
+                # the non-existent next one.
+                return QtCore.QModelIndex()
+            return self.createIndex(row, column, child)
         else:
-            return self.createIndex(row, column,
-                                    self.children_by_row[row])
+            try:
+                child = self.children_by_row[row]
+            except IndexError:
+                return QtCore.QModelIndex()
+            return self.createIndex(row, column, child)
 
     def _index_item(self, item):
         if item is self: