From 4660dd852f5a3556c2937c32214de7b766f12f3b Mon Sep 17 00:00:00 2001
From: ruddy douglass <ruddydouglass@outlook.com>
Date: Mon, 8 Mar 2021 16:42:34 -0500
Subject: [PATCH] Resolve issue 8347 by checking if the for nullptr. 
 Additionally resolve a couple other similar issues for keyboard accellerators

---
 companion/src/modeledit/inputs.cpp |  7 ++++++-
 companion/src/modeledit/mixes.cpp  | 10 ++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/companion/src/modeledit/inputs.cpp b/companion/src/modeledit/inputs.cpp
index f48d7d916..d12655c08 100644
--- a/companion/src/modeledit/inputs.cpp
+++ b/companion/src/modeledit/inputs.cpp
@@ -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();
diff --git a/companion/src/modeledit/mixes.cpp b/companion/src/modeledit/mixes.cpp
index 3d95bd04d..7f3da65b8 100644
--- a/companion/src/modeledit/mixes.cpp
+++ b/companion/src/modeledit/mixes.cpp
@@ -354,7 +354,10 @@ void MixesPanel::mixersDuplicate()
 
 void MixesPanel::mixerOpen()
 {
-  int idx = mixersListWidget->currentItem()->data(Qt::UserRole).toByteArray().at(0);
+  QListWidgetItem *item = mixersListWidget->currentItem();
+  if (item == nullptr) return;
+
+  int idx = item->data(Qt::UserRole).toByteArray().at(0);
   if(idx < 0) {
     int i = -idx;
     idx = getMixerIndex(i); //get mixer index to insert
@@ -371,7 +374,10 @@ void MixesPanel::mixerOpen()
 
 void MixesPanel::mixerHighlight()
 {
-  int idx = mixersListWidget->currentItem()->data(Qt::UserRole).toByteArray().at(0);
+  QListWidgetItem *item = mixersListWidget->currentItem();
+  if (item == nullptr) return;
+
+  int idx = item->data(Qt::UserRole).toByteArray().at(0);
   int dest;
   if (idx<0) {
     dest = -idx;