diff --git a/rpcs3/Emu/Io/camera_config.cpp b/rpcs3/Emu/Io/camera_config.cpp index c0813bd802..84b913890b 100644 --- a/rpcs3/Emu/Io/camera_config.cpp +++ b/rpcs3/Emu/Io/camera_config.cpp @@ -7,10 +7,11 @@ LOG_CHANNEL(camera_log, "Camera"); cfg_camera g_cfg_camera; cfg_camera::cfg_camera() + : cfg::node() #ifdef _WIN32 - : path(fs::get_config_dir() + "config/camera.yml") + , path(fs::get_config_dir() + "config/camera.yml") #else - : path(fs::get_config_dir() + "camera.yml") + , path(fs::get_config_dir() + "camera.yml") #endif { } diff --git a/rpcs3/rpcs3qt/qt_camera_handler.cpp b/rpcs3/rpcs3qt/qt_camera_handler.cpp index 18c906bd3e..cbb6f7ed46 100644 --- a/rpcs3/rpcs3qt/qt_camera_handler.cpp +++ b/rpcs3/rpcs3qt/qt_camera_handler.cpp @@ -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()); } - 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()