[Qt] Nits when using currentItem() -- make sure it's not None

This is in the spirit of the previous commit, 86b8a80
VitaeTeam · Apr 6, 2019 · 423785e · 423785e
1 parent 86b8a80
commit 423785e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/gui/qt/network_dialog.py b/gui/qt/network_dialog.py
@@ -115,7 +115,9 @@ def create_menu(self, position):
 
     def keyPressEvent(self, event):
         if event.key() in [ Qt.Key_F2, Qt.Key_Return ]:
-            self.on_activated(self.currentItem(), self.currentColumn())
+            item, col = self.currentItem(), self.currentColumn()
+            if item and col > -1:
+                self.on_activated(item, col)
         else:
             QTreeWidget.keyPressEvent(self, event)
 
@@ -212,7 +214,9 @@ def set_server(self, s):
 
     def keyPressEvent(self, event):
         if event.key() in [ Qt.Key_F2, Qt.Key_Return ]:
-            self.on_activated(self.currentItem(), self.currentColumn())
+            item, col = self.currentItem(), self.currentColumn()
+            if item and col > -1:
+                self.on_activated(item, col)
         else:
             QTreeWidget.keyPressEvent(self, event)
 

diff --git a/gui/qt/util.py b/gui/qt/util.py
@@ -490,7 +490,9 @@ def editItem(self, item, column):
 
     def keyPressEvent(self, event):
         if event.key() in [ Qt.Key_F2, Qt.Key_Return ] and self.editor is None:
-            self.on_activated(self.currentItem(), self.currentColumn())
+            item, col = self.currentItem(), self.currentColumn()
+            if item and col > -1:
+                self.on_activated(item, col)
         else:
             QTreeWidget.keyPressEvent(self, event)