From cc17d087b6a2e80dc470d16d8ef4208ba06a5499 Mon Sep 17 00:00:00 2001
From: cdozdil <cdozdil@gmail.com>
Date: Sat, 20 Apr 2024 00:09:53 +0300
Subject: [PATCH] fixed ini saving path

---
 OmniScaler/Config.cpp           |   5 +++--
 OmniScaler/Config.h             |   7 +++----
 OmniScaler/Logger.cpp           |   4 +++-
 OmniScaler/OmniScaler.rc        | Bin 3866 -> 3866 bytes
 OmniScaler/imgui/Imgui_Base.cpp |  11 +++++------
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/OmniScaler/Config.cpp b/OmniScaler/Config.cpp
index 95745d88..4cc5682b 100644
--- a/OmniScaler/Config.cpp
+++ b/OmniScaler/Config.cpp
@@ -130,7 +130,7 @@ std::string GetFloatValue(std::optional<float> value)
 	return std::to_string(value.value());
 }
 
-bool Config::SaveIni(std::string name)
+bool Config::SaveIni()
 {
 	// Upscalers
 	ini.SetValue("Upscalers", "Dx11Upscaler", Instance()->Dx11Upscaler.value_or("auto").c_str());
@@ -204,7 +204,8 @@ bool Config::SaveIni(std::string name)
 	ini.SetValue("Log", "OpenConsole", GetBoolValue(Instance()->OpenConsole).c_str());
 	ini.SetValue("Log", "LogFile", Instance()->LogFileName.value_or("auto").c_str());
 
-	return ini.SaveFile(name.c_str()) >= 0;
+	auto fileName = absoluteFileName.wstring().c_str();
+	return ini.SaveFile(fileName) >= 0;
 }
 
 std::optional<std::string> Config::readString(std::string section, std::string key, bool lowercase)
diff --git a/OmniScaler/Config.h b/OmniScaler/Config.h
index 3f05469f..3f6bd86c 100644
--- a/OmniScaler/Config.h
+++ b/OmniScaler/Config.h
@@ -91,13 +91,14 @@ public:
 	// dx11wdx12
 	std::optional<int> UseSafeSyncQueries;
 
-	// Engine Info
+	// nvngx info
 	NVSDK_NGX_EngineType NVNGX_Engine = NVSDK_NGX_ENGINE_TYPE_CUSTOM;
 	bool NVNGX_EngineVersion5 = false;
 	NVNGX_Api Api = NVNGX_NOT_SELECTED;
 	NVSDK_NGX_LoggingInfo NVSDK_Logger{ nullptr, NVSDK_NGX_LOGGING_LEVEL_OFF, false };
 	IFeature* CurrentFeature = nullptr;
 
+	// for realtime changes
 	bool changeBackend = false;
 	bool changeCAS = false;
 	std::string newBackend = "";
@@ -105,10 +106,8 @@ public:
 	int xessDebugFrames = 5;
 	float lastMipBias = 0.0f;
 	
-
-
 	void Reload();
-	bool SaveIni(std::string name);
+	bool SaveIni();
 
 	static Config* Instance();
 
diff --git a/OmniScaler/Logger.cpp b/OmniScaler/Logger.cpp
index 786ddbed..10db713a 100644
--- a/OmniScaler/Logger.cpp
+++ b/OmniScaler/Logger.cpp
@@ -5,6 +5,7 @@
 #include "spdlog/sinks/basic_file_sink.h"
 #include "spdlog/sinks/stdout_color_sinks.h"
 #include "spdlog/sinks/callback_sink.h"
+#include "Util.h"
 
 static bool InitializeConsole()
 {
@@ -77,7 +78,8 @@ void PrepareLogger()
 
 			if (Config::Instance()->LogToFile.value_or(false))
 			{
-				auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>(Config::Instance()->LogFileName.value_or("./OmniScaler.log"), true);
+				auto logFile = Util::DllPath().parent_path() / "OmniScaler.log";
+				auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>(Config::Instance()->LogFileName.value_or(logFile.string()), true);
 				file_sink->set_level(spdlog::level::level_enum::trace);
 				file_sink->set_pattern("[%H:%M:%S.%f] [%L] %v");
 
diff --git a/OmniScaler/OmniScaler.rc b/OmniScaler/OmniScaler.rc
index 6794b0e5bf786cd2becf9e7ad8e7e6846b47cf3f..0fd776a821171815c48845e7f32ac0dd1a76870f 100644
GIT binary patch
delta 46
wcmbOwH%o5A2UbSI$sbt_fn+Y5<YpVTT}(jcd=A~sDx8-X!A$YZeB3-N0A@4|uK)l5

delta 46
wcmbOwH%o5A2UbRd$sbt_fn+Y5<YpVTT}(jcd=A~sDx8-X!A$YZeB3-N0A<e&s{jB1

diff --git a/OmniScaler/imgui/Imgui_Base.cpp b/OmniScaler/imgui/Imgui_Base.cpp
index 0cb4ee70..fa64f03f 100644
--- a/OmniScaler/imgui/Imgui_Base.cpp
+++ b/OmniScaler/imgui/Imgui_Base.cpp
@@ -420,8 +420,8 @@ void Imgui_Base::RenderMenu()
 					Config::Instance()->newBackend = "";
 
 				// Dx11
-				ImGui::BeginDisabled(Config::Instance()->Api != NVNGX_DX11 || 
-									(Config::Instance()->Api == NVNGX_DX11 && Config::Instance()->Dx11Upscaler.value_or("fsr22") == "fsr22"));
+				ImGui::BeginDisabled(Config::Instance()->Api != NVNGX_DX11 ||
+					(Config::Instance()->Api == NVNGX_DX11 && Config::Instance()->Dx11Upscaler.value_or("fsr22") == "fsr22"));
 
 				const char* sync[] = { "No Syncing", "Shared Fences", "Shared Fences + Flush", "Shared Fences + Query", "Mostly Queries" };
 
@@ -598,8 +598,7 @@ void Imgui_Base::RenderMenu()
 					}
 				}
 
-				ImGui::SliderFloat("Ratio", &ssRatio, (float)Config::Instance()->CurrentFeature->DisplayWidth() / (float)Config::Instance()->CurrentFeature->RenderWidth(),
-					isXess12 ? 2.5f : 5.0f, "%.2f", ImGuiSliderFlags_NoRoundToFormat);
+				ImGui::SliderFloat("Ratio", &ssRatio, (float)Config::Instance()->CurrentFeature->DisplayWidth() / (float)Config::Instance()->CurrentFeature->RenderWidth(), isXess12 ? 2.5f : 5.0f, "%.2f");
 
 				ImGui::EndDisabled();
 
@@ -836,7 +835,7 @@ void Imgui_Base::RenderMenu()
 				ImGui::SameLine(ImGui::GetWindowWidth() - 130.0f);
 
 				if (ImGui::Button("Save INI"))
-					Config::Instance()->SaveIni("nvngx.ini");
+					Config::Instance()->SaveIni();
 
 				ImGui::SameLine(0.0f, 6.0f);
 
@@ -1003,7 +1002,7 @@ bool Imgui_Base::IsHandleDifferent()
 	HWND frontWindow = GetForegroundWindow(); // Util::GetProcessWindow(); -- for linux compatibility
 	GetWindowThreadProcessId(frontWindow, &procId);
 
-	if (processId != procId) 
+	if (processId != procId)
 		return false;
 
 	if (frontWindow == _handle)