Safety check in buy menu to hopefully fix an edge case crash

garethyr · garethyr · commit 18e835a9dd59 · 2023-05-30T01:29:23.000-03:00
diff --git a/Menus/BuyMenuGUI.cpp b/Menus/BuyMenuGUI.cpp
@@ -1954,7 +1954,7 @@ void BuyMenuGUI::Update()
                                 int lastItemToDelete = m_pCartList->GetItemList()->size() - 1;
                                 for (int i = m_ListItemIndex + 1; i != m_pCartList->GetItemList()->size(); i++) {
                                     GUIListPanel::Item *cartItem = m_pCartList->GetItem(i);
-                                    if (dynamic_cast<const Actor *>(cartItem->m_pEntity)) {
+                                    if (!cartItem || dynamic_cast<const Actor *>(cartItem->m_pEntity)) {
                                         lastItemToDelete = i - 1;
                                         break;
                                     }

Original file line number	Diff line number	Diff line change
`@@ -1954,7 +1954,7 @@ void BuyMenuGUI::Update()`
`1954`	`1954`	`int lastItemToDelete = m_pCartList->GetItemList()->size() - 1;`
`1955`	`1955`	`for (int i = m_ListItemIndex + 1; i != m_pCartList->GetItemList()->size(); i++) {`
`1956`	`1956`	`GUIListPanel::Item *cartItem = m_pCartList->GetItem(i);`
`1957`		`- if (dynamic_cast<const Actor *>(cartItem->m_pEntity)) {`
	`1957`	`+ if (!cartItem \|\| dynamic_cast<const Actor *>(cartItem->m_pEntity)) {`
`1958`	`1958`	`lastItemToDelete = i - 1;`
`1959`	`1959`	`break;`
`1960`	`1960`	`}`