Merge pull request #10800 from Pokechu22/registerwidget-crash

RegisterWidget: Fix crash when right-clicking when there is no selected cell
dolphin-emu · Jul 2, 2022 · 2a79111 · 2a79111
2 parents 07a15a3 + bf68211
commit 2a79111
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Source/Core/DolphinQt/Debugger/RegisterWidget.cpp b/Source/Core/DolphinQt/Debugger/RegisterWidget.cpp
@@ -114,11 +114,11 @@ void RegisterWidget::ShowContextMenu()
 {
   QMenu* menu = new QMenu(this);
 
-  auto variant = m_table->currentItem()->data(DATA_TYPE);
+  auto* raw_item = m_table->currentItem();
 
-  if (!variant.isNull())
+  if (raw_item != nullptr && !raw_item->data(DATA_TYPE).isNull())
   {
-    auto* item = static_cast<RegisterColumn*>(m_table->currentItem());
+    auto* item = static_cast<RegisterColumn*>(raw_item);
     auto type = static_cast<RegisterType>(item->data(DATA_TYPE).toInt());
     auto display = item->GetDisplay();