Skip to content

Commit c948303

Browse files
authored
SetHoveredPieSlice - unset m_ActiveSubPieMenu if set
When a different (or null) pie slice is selected, the current subpiemenu is obviously not relevant. Don't set it. This fixes a crash if the player goes into a subpiemenu, and, while holding pie menu button, switches actors (hence setting hovered pie slice to null, but leaving m_ActiveSubPieMenu set), then switches back, and tries to open pie menu again, causing a crash in `Update` on line 568.
1 parent 07bb70b commit c948303

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

Source/Entities/PieMenu.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,6 +1212,11 @@ bool PieMenu::SetHoveredPieSlice(const PieSlice* pieSliceToSelect, bool moveCurs
12121212
return false;
12131213
}
12141214

1215+
if (m_ActiveSubPieMenu) {
1216+
m_ActiveSubPieMenu->SetEnabled(false, false);
1217+
m_ActiveSubPieMenu = nullptr;
1218+
}
1219+
12151220
m_HoveredPieSlice = pieSliceToSelect;
12161221
m_SubPieMenuHoverOpenTimer.Reset();
12171222
m_BGBitmapNeedsRedrawing = true;

0 commit comments

Comments
 (0)