jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix issues with empty json and unknown path

Browse source
This commit is contained in:
Adam Honse 2020-11-04 23:54:29 -06:00
parent 8131b94a5d
commit c8e547343b
2 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ResourceManager.cpp
View file

@ -46,11 +46,6 @@ ResourceManager::ResourceManager()
\*-------------------------------------------------------------------------*/ \*-------------------------------------------------------------------------*/
server = new NetworkServer(rgb_controllers_hw); server = new NetworkServer(rgb_controllers_hw);
/*-------------------------------------------------------------------------*\
| Create OpenRGB configuration directory if it doesn't exist |
\*-------------------------------------------------------------------------*/
std::experimental::filesystem::create_directories(GetConfigurationDirectory());
/*-------------------------------------------------------------------------*\ /*-------------------------------------------------------------------------*\
| Load sizes list from file | | Load sizes list from file |
\*-------------------------------------------------------------------------*/ \*-------------------------------------------------------------------------*/
@ -220,6 +215,15 @@ std::string ResourceManager::GetConfigurationDirectory()
if(config_dir != "") if(config_dir != "")
{ {
config_dir = config_dir + "/OpenRGB/"; config_dir = config_dir + "/OpenRGB/";
/*-------------------------------------------------------------------------*\
| Create OpenRGB configuration directory if it doesn't exist |
\*-------------------------------------------------------------------------*/
std::experimental::filesystem::create_directories(config_dir);
}
else
{
config_dir = "./";
} }
return(config_dir); return(config_dir);
@ -355,7 +359,7 @@ void ResourceManager::DetectDevicesThreadFunction()
| Open device disable list and read in disabled | | Open device disable list and read in disabled |
| device strings | | device strings |
\*-------------------------------------------------*/ \*-------------------------------------------------*/
disabled_devices_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_DisabledDevices"); disabled_devices_settings = settings_manager->GetSettings("Setting_DisabledDevices");
if(disabled_devices_settings.contains("disabled")) if(disabled_devices_settings.contains("disabled"))
{ {

12
SettingsManager.cpp
View file

@ -26,10 +26,22 @@ SettingsManager::~SettingsManager()
json SettingsManager::GetSettings(std::string settings_key) json SettingsManager::GetSettings(std::string settings_key)
{ {
/*---------------------------------------------------------*\
| Check to see if the key exists in the settings store and |
| return the settings associated with the key if it exists |
\*---------------------------------------------------------*/
if(settings_data.contains(settings_key)) if(settings_data.contains(settings_key))
{ {
return(settings_data[settings_key]); return(settings_data[settings_key]);
} }
/*---------------------------------------------------------*\
| If the settings store doesn't contain the key, create an |
| empty json and return it |
\*---------------------------------------------------------*/
json empty;
return(empty);
} }
void SettingsManager::LoadSettings(std::string filename) void SettingsManager::LoadSettings(std::string filename)