Merge branch '4.21'

goncasmage1 · Jan 29, 2019 · 78325e1 · 78325e1
2 parents 2827f58 + d4c8208
commit 78325e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/Content/UINavDocs.uasset b/Content/UINavDocs.uasset
diff --git a/Source/UINavigation/Private/UINavWidget.cpp b/Source/UINavigation/Private/UINavWidget.cpp
@@ -159,6 +159,8 @@ void UUINavWidget::FetchButtonsInHierarchy()
 		!UINavButtons[ButtonIndex]->bIsEnabled)
 	{
 		ButtonIndex++;
+		if (ButtonIndex >= UINavButtons.Num()) ButtonIndex = 0;
+		if (ButtonIndex == FirstButtonIndex) break;
 	}
 }
 
@@ -994,6 +996,8 @@ int UUINavWidget::FindNextIndex(ENavigationDirection Direction)
 		!UINavButtons[NewIndex]->bIsEnabled)
 	{
 		NewIndex = FetchIndexByDirection(Direction, NewIndex);
+		if (NewIndex >= UINavButtons.Num()) NewIndex = 0;
+		if (NewIndex == ButtonIndex) return -1;
 	}
 	return NewIndex;
 }