diff --git a/Common/System/OSD.cpp b/Common/System/OSD.cpp index 3eaddce71d..1417e75827 100644 --- a/Common/System/OSD.cpp +++ b/Common/System/OSD.cpp @@ -171,6 +171,8 @@ void OnScreenDisplay::ShowLeaderboardTracker(int leaderboardTrackerID, const cha if (show) { // Just an update. entry.text = trackerText ? trackerText : ""; + // Bump the end-time, in case it was fading out. + entry.endTime = now + forever_s; } else { // Keep the current text, hide and eventually delete it. entry.endTime = now + (double)FadeoutTime(); diff --git a/UI/OnScreenDisplay.cpp b/UI/OnScreenDisplay.cpp index 1c76433742..200fd5e6aa 100644 --- a/UI/OnScreenDisplay.cpp +++ b/UI/OnScreenDisplay.cpp @@ -281,6 +281,10 @@ void OnScreenMessagesView::Draw(UIContext &dc) { auto &measuredEntry = measuredEntries[i]; ScreenEdgePosition pos = typeEdges[(size_t)entry.type]; + if (pos == ScreenEdgePosition::VALUE_COUNT) { + // NONE. + continue; + } measuredEntry.align = 0; measuredEntry.align2 = 0;