From 291ce4488a30176c8668170fa6de412cb1d79290 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Wed, 21 Aug 2024 02:26:48 +0200
Subject: [PATCH] Client: fix push/pop style var mismatch

Since the table was taken out of the child instance in commit 245ff565042870e0cded7a2ec3dcc868a00414af, we should no longer handle the window and frame separately. Car count must now be counted together.
---
 src/gameui/IBrowser.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/gameui/IBrowser.cpp b/src/gameui/IBrowser.cpp
index 4e30355c..d029505d 100644
--- a/src/gameui/IBrowser.cpp
+++ b/src/gameui/IBrowser.cpp
@@ -233,14 +233,13 @@ void CBrowser::DrawBrowserPanel(void)
     ImGui::TextColored(ImVec4(1.00f, 0.00f, 0.00f, 1.00f), "%s", m_serverListMessage.c_str());
     ImGui::Separator();
 
-    int windowStyleVars = 0; // Eliminate borders around server list table.
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2{ 1.f, 0.f });  windowStyleVars++;
+    int frameStyleVars = 0; // Eliminate borders around server list table.
+    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2{ 1.f, 0.f });  frameStyleVars++;
 
     const float fFooterHeight = ImGui::GetStyle().ItemSpacing.y + ImGui::GetFrameHeightWithSpacing();
 
     if (ImGui::BeginTable("##ServerBrowser_ServerListTable", 6, ImGuiTableFlags_Resizable | ImGuiTableFlags_ScrollY, { 0, -fFooterHeight }))
     {
-        int frameStyleVars = 0;
         if (m_surfaceStyle == ImGuiStyle_t::MODERN)
         {
             ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2{ 8.f, 0.f }); frameStyleVars++;
@@ -327,12 +326,14 @@ void CBrowser::DrawBrowserPanel(void)
         filteredServers.clear();
         g_ServerListManager.m_Mutex.Unlock();
 
+        ImGui::PopStyleVar(frameStyleVars);
         ImGui::EndTable();
+    }
+    else
+    {
         ImGui::PopStyleVar(frameStyleVars);
     }
 
-    ImGui::PopStyleVar(windowStyleVars);
-
     ImGui::Separator();
 
     const ImVec2 regionAvail = ImGui::GetContentRegionAvail();