mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2026-06-07 10:14:59 -06:00
load settings
This commit is contained in:
parent
aba1d8242f
commit
b97cd2753c
@ -22,6 +22,7 @@
|
|||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#endif
|
#endif
|
||||||
|
#include <core/emulator_settings.h>
|
||||||
|
|
||||||
int main(int argc, char* argv[]) {
|
int main(int argc, char* argv[]) {
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
@ -32,6 +33,10 @@ int main(int argc, char* argv[]) {
|
|||||||
std::shared_ptr<EmulatorState> m_emu_state = std::make_shared<EmulatorState>();
|
std::shared_ptr<EmulatorState> m_emu_state = std::make_shared<EmulatorState>();
|
||||||
EmulatorState::SetInstance(m_emu_state);
|
EmulatorState::SetInstance(m_emu_state);
|
||||||
// Load configurations
|
// Load configurations
|
||||||
|
std::shared_ptr<EmulatorSettings> emu_settings = std::make_shared<EmulatorSettings>();
|
||||||
|
EmulatorSettings::SetInstance(emu_settings);
|
||||||
|
emu_settings->Load();
|
||||||
|
|
||||||
const auto user_dir = Common::FS::GetUserPath(Common::FS::PathType::UserDir);
|
const auto user_dir = Common::FS::GetUserPath(Common::FS::PathType::UserDir);
|
||||||
Config::load(user_dir / "config.toml");
|
Config::load(user_dir / "config.toml");
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user