From 53ee2275e4d2997f6bda8f263efcbdd8bd70441b Mon Sep 17 00:00:00 2001 From: FlightlessMango Date: Tue, 12 Sep 2023 10:16:49 +0200 Subject: [PATCH] hudelements: fix exec not appearing on the same line as custom_text --- src/hud_elements.cpp | 8 ++++++-- src/overlay.cpp | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/hud_elements.cpp b/src/hud_elements.cpp index 6abb331d..a5a8cc99 100644 --- a/src/hud_elements.cpp +++ b/src/hud_elements.cpp @@ -818,8 +818,12 @@ void HudElements::custom_text_center(){ void HudElements::custom_text(){ ImguiNextColumnFirstItem(); ImGui::PushFont(HUDElements.sw_stats->font1); - const std::string& value = HUDElements.ordered_functions[HUDElements.place].second; - HUDElements.TextColored(HUDElements.colors.text, "%s",value.c_str()); + const char* value; + if (size_t(HUDElements.place) < HUDElements.ordered_functions.size()) + value = HUDElements.ordered_functions[HUDElements.place].second.c_str(); + else + return; + HUDElements.TextColored(HUDElements.colors.text, "%s",value); ImGui::PopFont(); } diff --git a/src/overlay.cpp b/src/overlay.cpp index 293ef3ba..ea810b81 100644 --- a/src/overlay.cpp +++ b/src/overlay.cpp @@ -668,7 +668,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& HUDElements.place = 0; for (auto& func : HUDElements.ordered_functions){ ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, ImVec2(-3,-3)); - if(!params.enabled[OVERLAY_PARAM_ENABLED_horizontal]) + if(!params.enabled[OVERLAY_PARAM_ENABLED_horizontal] && func.first != HudElements::_exec) ImGui::TableNextRow(); func.first(); HUDElements.place += 1;