Resolve issue 8347 by checking if the for nullptr. Additionally resolve a couple other similar issues for keyboard accellerators

2021-03-08 16:42:34 -05:00
parent f4866c822a
commit 4660dd852f
2 changed files with 14 additions and 3 deletions
@@ -351,6 +351,8 @@ void InputsPanel::expoOpen(QListWidgetItem *item)
  if (!item)
    item = ExposlistWidget->currentItem();

+  if (item == nullptr) return;
+
  int idx = item->data(Qt::UserRole).toByteArray().at(0);
  if (idx < 0) {
    int ch = -idx - 1;
@@ -368,7 +370,10 @@ void InputsPanel::expoOpen(QListWidgetItem *item)

 void InputsPanel::expoAdd()
 {
-  int index = ExposlistWidget->currentItem()->data(Qt::UserRole).toByteArray().at(0);
+  QListWidgetItem *item = ExposlistWidget->currentItem();
+  if (item == nullptr) return;
+
+  int index = item->data(Qt::UserRole).toByteArray().at(0);

  if (index < 0) {  // if empty then return relevant index
    expoOpen();