From f015667f889848fdc883a86eb50ab69000d0ed41 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Tue, 9 Aug 2022 12:13:31 +0200
Subject: [PATCH] Light ImGui cleanup

* CTextLogger: Explicit cast return value of size() to int when testing int value against size_t.
* CBrowser: Run think and request thread on client.dll, but for the request, only the refresh.
---
 r5dev/gameui/IBrowser.cpp                   |  8 ++++----
 r5dev/thirdparty/imgui/src/imgui_logger.cpp | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/r5dev/gameui/IBrowser.cpp b/r5dev/gameui/IBrowser.cpp
index 7f9a84bb..923156f7 100644
--- a/r5dev/gameui/IBrowser.cpp
+++ b/r5dev/gameui/IBrowser.cpp
@@ -43,22 +43,22 @@ History:
 CBrowser::CBrowser(void)
 {
     memset(m_szServerAddressBuffer, '\0', sizeof(m_szServerAddressBuffer));
-#ifndef CLIENT_DLL
-    static std::thread hostingServerRequestThread([this]()
+    static std::thread request([this]()
     {
         RefreshServerList();
+#ifndef CLIENT_DLL
         while (true)
         {
             UpdateHostingStatus();
             std::this_thread::sleep_for(std::chrono::milliseconds(5000));
         }
+#endif // !CLIENT_DLL
     });
 
-    hostingServerRequestThread.detach();
+    request.detach();
 
     std::thread think(&CBrowser::Think, this);
     think.detach();
-#endif // !CLIENT_DLL
 
     m_pszBrowserTitle = "Server Browser";
     m_rLockedIconBlob = GetModuleResource(IDB_PNG2);
diff --git a/r5dev/thirdparty/imgui/src/imgui_logger.cpp b/r5dev/thirdparty/imgui/src/imgui_logger.cpp
index a484b9d1..373e2444 100644
--- a/r5dev/thirdparty/imgui/src/imgui_logger.cpp
+++ b/r5dev/thirdparty/imgui/src/imgui_logger.cpp
@@ -257,7 +257,7 @@ CTextLogger::Coordinates CTextLogger::ScreenPosToCoordinates(const ImVec2& aPosi
 		int columnIndex = 0;
 		float columnX = 0.0f;
 
-		while ((size_t)columnIndex < line.size())
+		while (columnIndex < static_cast<int>(line.size()))
 		{
 			float columnWidth = 0.0f;
 
@@ -375,7 +375,7 @@ CTextLogger::Coordinates CTextLogger::FindNextWord(const Coordinates & aFrom) co
 
 	while (!isword || skip)
 	{
-		if (at.m_nLine >= m_Lines.size())
+		if (at.m_nLine >= static_cast<int>(m_Lines.size()))
 		{
 			int l = std::max(0, static_cast<int>(m_Lines.size() - 1));
 			return Coordinates(l, GetLineMaxColumn(l));
@@ -408,7 +408,7 @@ CTextLogger::Coordinates CTextLogger::FindNextWord(const Coordinates & aFrom) co
 
 int CTextLogger::GetCharacterIndex(const Coordinates& aCoordinates) const
 {
-	if (aCoordinates.m_nLine >= m_Lines.size())
+	if (aCoordinates.m_nLine >= static_cast<int>(m_Lines.size()))
 		return -1;
 
 	const Line& line = m_Lines[aCoordinates.m_nLine];
@@ -1193,7 +1193,7 @@ void CTextLogger::MoveRight(int aAmount, bool aSelect, bool aWordMode)
 {
 	const Coordinates oldPos = m_State.m_CursorPosition;
 
-	if (m_Lines.empty() || oldPos.m_nLine >= m_Lines.size())
+	if (m_Lines.empty() || oldPos.m_nLine >= static_cast<int>(m_Lines.size()))
 		return;
 
 	int cindex = GetCharacterIndex(m_State.m_CursorPosition);
@@ -1202,9 +1202,9 @@ void CTextLogger::MoveRight(int aAmount, bool aSelect, bool aWordMode)
 		int lindex = m_State.m_CursorPosition.m_nLine;
 		const Line& line = m_Lines[lindex];
 
-		if (cindex >= line.size()) // !CAST: SIZE_T
+		if (cindex >= static_cast<int>(line.size()))
 		{
-			if (m_State.m_CursorPosition.m_nLine < m_Lines.size() - 1)
+			if (m_State.m_CursorPosition.m_nLine < static_cast<int>(m_Lines.size()) - 1)
 			{
 				m_State.m_CursorPosition.m_nLine = std::max(0, std::min(static_cast<int>(m_Lines.size()) - 1, m_State.m_CursorPosition.m_nLine + 1));
 				m_State.m_CursorPosition.m_nColumn = 0;