From 72e6ee1a2baf1ae46962e30a68d946e897237e5c Mon Sep 17 00:00:00 2001 From: zilmar Date: Thu, 7 Nov 2024 13:24:45 +1030 Subject: [PATCH] Core: Normalize RomDatabase, VideoRDB, AudioRdb file paths --- .../Settings/SettingType/SettingsType-RomDatabase.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.cpp index 5c45f7ec3..ec97c9cdf 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "SettingsType-RomDatabase.h" +#include CIniFile * CSettingTypeRomDatabase::m_SettingsIniFile = nullptr; CIniFile * CSettingTypeRomDatabase::m_VideoIniFile = nullptr; @@ -59,9 +60,9 @@ void CSettingTypeRomDatabase::Initialize(void) { WriteTrace(TraceAppInit, TraceDebug, "Start"); - m_SettingsIniFile = new CIniFile(g_Settings->LoadStringVal(SupportFile_RomDatabase).c_str()); - m_VideoIniFile = new CIniFile(g_Settings->LoadStringVal(SupportFile_VideoRDB).c_str()); - m_AudioIniFile = new CIniFile(g_Settings->LoadStringVal(SupportFile_AudioRDB).c_str()); + m_SettingsIniFile = new CIniFile(CPath(g_Settings->LoadStringVal(SupportFile_RomDatabase).c_str()).NormalizePath(CPath(CPath::MODULE_DIRECTORY))); + m_VideoIniFile = new CIniFile(CPath(g_Settings->LoadStringVal(SupportFile_VideoRDB).c_str()).NormalizePath(CPath(CPath::MODULE_DIRECTORY))); + m_AudioIniFile = new CIniFile(CPath(g_Settings->LoadStringVal(SupportFile_AudioRDB).c_str()).NormalizePath(CPath(CPath::MODULE_DIRECTORY))); g_Settings->RegisterChangeCB(Game_IniKey, nullptr, GameChanged); g_Settings->RegisterChangeCB(Cmd_BaseDirectory, nullptr, BaseDirChanged);