From 73ff0bd0c174b1a32665416608a051223398c77d Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Mon, 29 Aug 2022 03:03:53 +0200
Subject: [PATCH] Licht cleanup

* Removed unnecessary header files.
* Removed unnecessary c-string cast.
* Use lock_guard for mutex.
---
 r5dev/gameui/IBrowser.cpp | 5 +----
 r5dev/gameui/IConsole.cpp | 4 +---
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/r5dev/gameui/IBrowser.cpp b/r5dev/gameui/IBrowser.cpp
index b772cb60..c2fdb0ae 100644
--- a/r5dev/gameui/IBrowser.cpp
+++ b/r5dev/gameui/IBrowser.cpp
@@ -32,11 +32,8 @@ History:
 #include "networksystem/pylon.h"
 #include "networksystem/listmanager.h"
 #include "squirrel/sqinit.h"
-#include "squirrel/sqapi.h"
-#include "client/vengineclient_impl.h"
 #include "vpc/keyvalues.h"
 #include "vstdlib/callback.h"
-#include "vpklib/packedstore.h"
 #include "gameui/IBrowser.h"
 #include "public/edict.h"
 
@@ -669,7 +666,7 @@ void CBrowser::SettingsPanel(void)
     ImGui::InputTextWithHint("Hostname", "Matchmaking Server String", &m_szMatchmakingHostName);
     if (ImGui::Button("Update Hostname"))
     {
-        ProcessCommand(fmt::format("{:s} \"{:s}\"", "pylon_matchmaking_hostname", m_szMatchmakingHostName.c_str()).c_str());
+        ProcessCommand(fmt::format("{:s} \"{:s}\"", "pylon_matchmaking_hostname", m_szMatchmakingHostName).c_str());
     }
     ImGui::InputText("Netkey", const_cast<char*>(g_svNetKey.c_str()), ImGuiInputTextFlags_ReadOnly);
     if (ImGui::Button("Regenerate Encryption Key"))
diff --git a/r5dev/gameui/IConsole.cpp b/r5dev/gameui/IConsole.cpp
index 4f57204e..88630540 100644
--- a/r5dev/gameui/IConsole.cpp
+++ b/r5dev/gameui/IConsole.cpp
@@ -22,7 +22,6 @@ History:
 #include "windows/console.h"
 #include "windows/resource.h"
 #include "gameui/IConsole.h"
-#include "client/vengineclient_impl.h"
 
 //-----------------------------------------------------------------------------
 // Purpose: 
@@ -617,7 +616,7 @@ void CConsole::BuildSummary(string svConVar)
 //-----------------------------------------------------------------------------
 void CConsole::ClampLogSize(void)
 {
-    m_Mutex.lock();
+    std::lock_guard<std::mutex> l(m_Mutex);
     if (m_Logger.GetTotalLines() > con_max_size_logvector->GetInt())
     {
         while (m_Logger.GetTotalLines() > con_max_size_logvector->GetInt())
@@ -630,7 +629,6 @@ void CConsole::ClampLogSize(void)
         m_Logger.MoveCursor(m_nSelectBack, false);
         m_nSelectBack = 0;
     }
-    m_Mutex.unlock();
 }
 
 //-----------------------------------------------------------------------------