Skip to content

Commit 8862cd8

Browse files
committed
Integrated Helium's fix too, it's redundant but safer this way
1 parent 9c6f142 commit 8862cd8

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Source/Entities/PieMenu.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ void PieMenu::Update() {
579579
m_CursorInVisiblePosition = true;
580580
} else {
581581
bool shouldClearHoveredSlice = controller->IsState(ControlState::PIE_MENU_ACTIVE_ANALOG);
582-
582+
583583
// If a keyboard-only sub-PieMenu is exited by going off the sides, the parent PieMenu should handle input so the next PieSlice can be naturally stepped to.
584584
if (activeSubPieMenuDirection != Directions::None) {
585585
for (const auto& [controlState, controlStateDirection]: c_ControlStateDirections) {
@@ -609,10 +609,6 @@ void PieMenu::Update() {
609609
if (anyInput) {
610610
m_HoverTimer.Reset();
611611
}
612-
613-
if (!IsSubPieMenu() && m_HoverTimer.IsPastRealTimeLimit()) {
614-
SetHoveredPieSlice(nullptr);
615-
}
616612
}
617613

618614
if (m_HoveredPieSlice && m_EnabledState != EnabledState::Disabled && !m_ActiveSubPieMenu) {
@@ -621,6 +617,10 @@ void PieMenu::Update() {
621617

622618
if (!IsSubPieMenu()) {
623619
SetEnabled(controller->IsState(ControlState::PIE_MENU_ACTIVE));
620+
621+
if (m_HoverTimer.IsPastRealTimeLimit()) {
622+
SetHoveredPieSlice(nullptr);
623+
}
624624
}
625625
}
626626

0 commit comments

Comments
 (0)