Merge pull request #12 from RaidcoreGG/dev

Day 1 issues fixes
RaidcoreGG · Nov 15, 2023 · 92e9533 · 92e9533
2 parents 2150367 + b084ef3
commit 92e9533
Show file tree

Hide file tree

Showing 9 changed files with 79 additions and 48 deletions.
diff --git a/src/GUI/GUI.cpp b/src/GUI/GUI.cpp
@@ -481,15 +481,57 @@ namespace GUI
 				LastScaling = Settings::Settings[OPT_LASTUISCALE].get<float>();
 				Renderer::Scaling = Settings::Settings[OPT_LASTUISCALE].get<float>();
 			}
+			else
+			{
+				LastScaling = SC_NORMAL;
+				Renderer::Scaling = SC_NORMAL;
+				Settings::Settings[OPT_LASTUISCALE] = SC_NORMAL;
+			}
+
+			if (!Settings::Settings[OPT_QAVERTICAL].is_null())
+			{
+				QuickAccess::VerticalLayout = Settings::Settings[OPT_QAVERTICAL].get<bool>();
+			}
+			else
+			{
+				QuickAccess::VerticalLayout = false;
+				Settings::Settings[OPT_QAVERTICAL] = false;
+			}
+
+			if (!Settings::Settings[OPT_QALOCATION].is_null())
+			{
+				QuickAccess::Location = (EQAPosition)Settings::Settings[OPT_QALOCATION].get<int>();
+			}
+			else
+			{
+				QuickAccess::Location = EQAPosition::Extend;
+				Settings::Settings[OPT_QALOCATION] = 0;
+			}
 
-			if (!Settings::Settings[OPT_QAVERTICAL].is_null()) { QuickAccess::VerticalLayout = Settings::Settings[OPT_QAVERTICAL].get<bool>(); }
-			if (!Settings::Settings[OPT_QALOCATION].is_null()) { QuickAccess::Location = (EQAPosition)Settings::Settings[OPT_QALOCATION].get<int>(); }
 			if (!Settings::Settings[OPT_QAOFFSETX].is_null() && !Settings::Settings[OPT_QAOFFSETY].is_null())
 			{
 				QuickAccess::Offset = ImVec2(Settings::Settings[OPT_QAOFFSETX].get<float>(), Settings::Settings[OPT_QAOFFSETY].get<float>());
 			}
+			else
+			{
+				QuickAccess::Offset = ImVec2(0.0f, 0.0f);
+				Settings::Settings[OPT_QAOFFSETX] = 0.0f;
+				Settings::Settings[OPT_QAOFFSETY] = 0.0f;
+			}
 
-			if (!Settings::Settings[OPT_CLOSEMENU].is_null()) { CloseMenuAfterSelecting = Settings::Settings[OPT_CLOSEMENU].get<bool>(); }
+			if (!Settings::Settings[OPT_CLOSEMENU].is_null())
+			{
+				CloseMenuAfterSelecting = Settings::Settings[OPT_CLOSEMENU].get<bool>();
+			}
+			else
+			{
+				CloseMenuAfterSelecting = true;
+				Settings::Settings[OPT_CLOSEMENU] = true;
+			}
+		}
+		else
+		{
+			LogDebug("meme", "settings initially null");
 		}
 
 		IsSetup = true;

diff --git a/src/GUI/Widgets/Options/OptionsWindow.cpp b/src/GUI/Widgets/Options/OptionsWindow.cpp
@@ -52,6 +52,15 @@ namespace GUI
 				}
 				ImGui::TooltipGeneric("Enables the Debug menu and some other features.");
 
+				ImGui::TextDisabled("Font Size");
+				if (ImGui::InputFloat("##fontsize", &GUI::FontSize, 0.0f, 0.0f, "%.1f", ImGuiInputTextFlags_EnterReturnsTrue))
+				{
+					Settings::Settings[OPT_FONTSIZE] = FontSize;
+					Settings::Save();
+				}
+				ImGui::TooltipGeneric("Changing font size requires a restart.");
+
+
 				ImGui::TextDisabled("UI/UX");
 				if (ImGui::Checkbox("Close Menu after selecting item", &GUI::CloseMenuAfterSelecting))
 				{

diff --git a/src/Keybinds/KeybindHandler.cpp b/src/Keybinds/KeybindHandler.cpp
@@ -250,6 +250,7 @@ namespace Keybinds
 			if (it->second == aKeybind)
 			{
 				kb.Key = it->first;
+				break;
 			}
 		}
 

diff --git a/src/Logging/LogHandler.cpp b/src/Logging/LogHandler.cpp
@@ -9,9 +9,6 @@ namespace LogHandler
 	std::vector<LogEntry> LogEntries;
 	std::vector<std::string> Channels;
 
-	bool IsRunning = false;
-	int IndexProcessed = 0;
-	std::thread LoggingThread;
 
 	void Initialize()
 	{
@@ -24,14 +21,6 @@ namespace LogHandler
 
 		FileLogger* fLog = new FileLogger(ELogLevel::ALL, Path::F_LOG);
 		RegisterLogger(fLog);
-
-		IsRunning = true;
-		LoggingThread = std::thread(ProcessQueueLoop);
-		LoggingThread.detach();
-	}
-	void Shutdown()
-	{
-		IsRunning = false;
 	}
 
 	void RegisterLogger(ILogger* aLogger)
@@ -87,37 +76,16 @@ namespace LogHandler
 		Mutex.lock();
 		{
 			LogEntries.push_back(entry);
-		}
-		Mutex.unlock();
-	}
-	void ProcessQueueLoop()
-	{
-		for (;;)
-		{
-			if (!IsRunning) { return; }
-
-			while (LogEntries.size() > IndexProcessed + 1)
+			for (ILogger* logger : Registry)
 			{
-				Mutex.lock();
+				/* send logged message to logger if message log level is lower than logger level */
+				if (entry.LogLevel <= logger->GetLogLevel())
 				{
-					LogEntry& entry = LogEntries[IndexProcessed + 1];
-
-					for (ILogger* logger : Registry)
-					{
-						ELogLevel level = logger->GetLogLevel();
-
-						/* send logged message to logger if message log level is lower than logger level */
-						if (entry.LogLevel <= level)
-						{
-							logger->LogMessage(entry);
-						}
-					}
-
-					IndexProcessed++;
+					logger->LogMessage(entry);
 				}
-				Mutex.unlock();
 			}
 		}
+		Mutex.unlock();
 	}
 
 	int Verify(void* aStartAddress, void* aEndAddress)

diff --git a/src/Logging/LogHandler.h b/src/Logging/LogHandler.h
@@ -25,12 +25,7 @@ namespace LogHandler
 	extern std::vector<LogEntry> LogEntries;
 	extern std::vector<std::string> Channels;
 
-	extern bool IsRunning;
-	extern int IndexProcessed;
-	extern std::thread LoggingThread;
-
 	void Initialize();
-	void Shutdown();
 
 	void RegisterLogger(ILogger* aLogger);
 	void UnregisterLogger(ILogger* aLogger);

diff --git a/src/State.cpp b/src/State.cpp
@@ -52,6 +52,10 @@ namespace State
 			if ((subpos = cmp.find("mumble ")) != std::string::npos)
 			{
 				subtoken = token.substr(7, token.length() - subpos);
+				if (std::regex_match(subtoken, std::regex("\"(.*?)\"")))
+				{
+					subtoken = subtoken.substr(1, subtoken.length() - 2);
+				}
 				//Log("dbg", "subtoken: \"%s\" @ %d", subtoken.c_str(), subpos);
 
 				customMumble = true;

diff --git a/src/State.h b/src/State.h
@@ -5,6 +5,7 @@
 #include <string>
 #include <algorithm>
 #include <shellapi.h>
+#include <regex>
 
 #include "Consts.h"
 #include "Shared.h"

diff --git a/src/Updater/Updater.cpp b/src/Updater/Updater.cpp
@@ -93,5 +93,10 @@ namespace Updater
 				}
 			}
 		}
+
+		if (std::filesystem::exists(Path::F_UPDATE_DLL))
+		{
+			std::filesystem::remove(Path::F_UPDATE_DLL);
+		}
 	}
 }
diff --git a/src/entry.cpp b/src/entry.cpp
@@ -71,7 +71,15 @@ void Initialize()
 		Keybinds::Load();
 		Settings::Load();
 
-		if (!Settings::Settings[OPT_DEVMODE].is_null()) { State::IsDeveloperMode = Settings::Settings[OPT_DEVMODE].get<bool>(); }
+		if (!Settings::Settings[OPT_DEVMODE].is_null())
+		{
+			State::IsDeveloperMode = Settings::Settings[OPT_DEVMODE].get<bool>();
+		}
+		else
+		{
+			State::IsDeveloperMode = false;
+			Settings::Settings[OPT_DEVMODE] = false;
+		}
 		//API::Initialize();
 
 		Mumble::Initialize();
@@ -110,8 +118,6 @@ void Shutdown()
 		//API::Save();
 
 		MH_Uninitialize();
-
-		LogHandler::Shutdown();
 	}
 
 	// free libs
-Original file line number
+Diff line change
@@ Expand Up / @@ -250,6 +250,7 @@ namespace Keybinds @@
     			if (it->second == aKeybind)
     			{
     				kb.Key = it->first;
+    				break;
     			}
     		}
@@ Expand Down @@