From d859d99af4fa1f3f95e248f9936f871a5b8202ae Mon Sep 17 00:00:00 2001 From: Steve Streeting Date: Mon, 9 Jan 2023 16:14:41 +0000 Subject: [PATCH] Better current run name implementation --- .../Private/StevesUI/TypewriterTextWidget.cpp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/Source/StevesUEHelpers/Private/StevesUI/TypewriterTextWidget.cpp b/Source/StevesUEHelpers/Private/StevesUI/TypewriterTextWidget.cpp index 2da43e6..26813a7 100644 --- a/Source/StevesUEHelpers/Private/StevesUI/TypewriterTextWidget.cpp +++ b/Source/StevesUEHelpers/Private/StevesUI/TypewriterTextWidget.cpp @@ -331,6 +331,11 @@ FString UTypewriterTextWidget::CalculateSegments(FString* OutCurrentRunName) { Result += TEXT(""); } + if (OutCurrentRunName) + { + *OutCurrentRunName = Segment.RunInfo.Name; + } + } if (bIsSegmentComplete) @@ -344,19 +349,7 @@ FString UTypewriterTextWidget::CalculateSegments(FString* OutCurrentRunName) break; } } - - if (OutCurrentRunName) - { - if (CurrentSegmentIndex < Segments.Num()) - { - *OutCurrentRunName = Segments[CurrentSegmentIndex].RunInfo.Name; - } - else - { - *OutCurrentRunName = ""; - } - } - + return Result; }