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

Ignore location string when loading profiles for HID devices

Browse source
This commit is contained in:
Adam Honse 2020-12-03 00:10:53 -06:00
parent d19baf1365
commit a7acefb284
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
ProfileManager.cpp
View file

@ -171,16 +171,28 @@ bool ProfileManager::LoadDeviceFromListWithOptions
{
RGBController *temp_controller = temp_controllers[temp_index];
/*---------------------------------------------------------*\
| Do not compare location string for HID devices, as the |
| location string may change between runs as devices are |
| connected and disconnected |
\*---------------------------------------------------------*/
bool compare_location = true;
if(load_controller->location.find("HID: ") == 0)
{
compare_location = false;
}
/*---------------------------------------------------------*\
| Test if saved controller data matches this controller |
\*---------------------------------------------------------*/
if((temp_controller_used[temp_index] == false )
&&(temp_controller->type == load_controller->type )
&&(temp_controller->name == load_controller->name )
&&(temp_controller->description == load_controller->description)
&&(temp_controller->version == load_controller->version )
&&(temp_controller->serial == load_controller->serial )
&&(temp_controller->location == load_controller->location ))
if((temp_controller_used[temp_index] == false )
&&(temp_controller->type == load_controller->type )
&&(temp_controller->name == load_controller->name )
&&(temp_controller->description == load_controller->description )
&&(temp_controller->version == load_controller->version )
&&(temp_controller->serial == load_controller->serial )
&&((temp_controller->location == load_controller->location ) || (!compare_location)))
{
/*---------------------------------------------------------*\
| Update zone sizes if requested |