archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-13 18:28:35 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Qt: minor camera config warning fixes

Browse source
This commit is contained in:
Megamouse 2022-11-05 10:48:32 +01:00
parent 89de913e95
commit 4f5076346d
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rpcs3/Emu/Io/camera_config.cpp
View file

@ -7,10 +7,11 @@ LOG_CHANNEL(camera_log, "Camera");
cfg_camera g_cfg_camera; cfg_camera g_cfg_camera;
cfg_camera::cfg_camera() cfg_camera::cfg_camera()
: cfg::node()
#ifdef _WIN32 #ifdef _WIN32
: path(fs::get_config_dir() + "config/camera.yml") , path(fs::get_config_dir() + "config/camera.yml")
#else #else
: path(fs::get_config_dir() + "camera.yml") , path(fs::get_config_dir() + "camera.yml")
#endif #endif
{ {
} }

5
rpcs3/rpcs3qt/qt_camera_handler.cpp
View file

@ -18,7 +18,10 @@ qt_camera_handler::qt_camera_handler() : camera_handler_base()
camera_log.success("Found camera: name=%s, description=%s", cameraInfo.deviceName().toStdString(), cameraInfo.description().toStdString()); camera_log.success("Found camera: name=%s, description=%s", cameraInfo.deviceName().toStdString(), cameraInfo.description().toStdString());
} }
g_cfg_camera.load(); if (!g_cfg_camera.load())
{
camera_log.notice("Could not load camera config. Using defaults.");
}
} }
qt_camera_handler::~qt_camera_handler() qt_camera_handler::~qt_camera_handler()