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

More size loading fixes

Browse source
This commit is contained in:
Adam Honse 2020-12-03 01:03:44 -06:00
parent 49fda962be
commit 61d4b8fa5d
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ProfileManager.cpp
View file

@ -194,6 +194,11 @@ bool ProfileManager::LoadDeviceFromListWithOptions
&&(temp_controller->serial == load_controller->serial ) &&(temp_controller->serial == load_controller->serial )
&&((temp_controller->location == load_controller->location ) || (!compare_location))) &&((temp_controller->location == load_controller->location ) || (!compare_location)))
{ {
/*---------------------------------------------------------*\
| Set used flag for this temp device |
\*---------------------------------------------------------*/
temp_controller_used[temp_index] = true;
/*---------------------------------------------------------*\ /*---------------------------------------------------------*\
| Update zone sizes if requested | | Update zone sizes if requested |
\*---------------------------------------------------------*/ \*---------------------------------------------------------*/
@ -263,8 +268,6 @@ bool ProfileManager::LoadDeviceFromListWithOptions
} }
} }
temp_controller_used[temp_index] = true;
return(true); return(true);
} }
} }

6
ResourceManager.cpp
View file

@ -502,7 +502,7 @@ void ResourceManager::DetectDevicesThreadFunction()
/*-------------------------------------------------*\ /*-------------------------------------------------*\
| First, load sizes for the new controllers | | First, load sizes for the new controllers |
\*-------------------------------------------------*/ \*-------------------------------------------------*/
for(unsigned int controller_size_idx = prev_count - 1; controller_size_idx < rgb_controllers_hw.size(); controller_size_idx++) for(unsigned int controller_size_idx = prev_count; controller_size_idx < rgb_controllers_hw.size(); controller_size_idx++)
{ {
profile_manager->LoadDeviceFromListWithOptions(rgb_controllers_sizes, size_used, rgb_controllers_hw[controller_size_idx], true, false); profile_manager->LoadDeviceFromListWithOptions(rgb_controllers_sizes, size_used, rgb_controllers_hw[controller_size_idx], true, false);
} }
@ -595,7 +595,7 @@ void ResourceManager::DetectDevicesThreadFunction()
/*-------------------------------------------------*\ /*-------------------------------------------------*\
| First, load sizes for the new controllers | | First, load sizes for the new controllers |
\*-------------------------------------------------*/ \*-------------------------------------------------*/
for(unsigned int controller_size_idx = prev_count - 1; controller_size_idx < rgb_controllers_hw.size(); controller_size_idx++) for(unsigned int controller_size_idx = prev_count; controller_size_idx < rgb_controllers_hw.size(); controller_size_idx++)
{ {
profile_manager->LoadDeviceFromListWithOptions(rgb_controllers_sizes, size_used, rgb_controllers_hw[controller_size_idx], true, false); profile_manager->LoadDeviceFromListWithOptions(rgb_controllers_sizes, size_used, rgb_controllers_hw[controller_size_idx], true, false);
} }
@ -724,7 +724,7 @@ void ResourceManager::DetectDevicesThreadFunction()
/*-------------------------------------------------*\ /*-------------------------------------------------*\
| First, load sizes for the new controllers | | First, load sizes for the new controllers |
\*-------------------------------------------------*/ \*-------------------------------------------------*/
for(unsigned int controller_size_idx = prev_count - 1; controller_size_idx < rgb_controllers_hw.size(); controller_size_idx++) for(unsigned int controller_size_idx = prev_count; controller_size_idx < rgb_controllers_hw.size(); controller_size_idx++)
{ {
profile_manager->LoadDeviceFromListWithOptions(rgb_controllers_sizes, size_used, rgb_controllers_hw[controller_size_idx], true, false); profile_manager->LoadDeviceFromListWithOptions(rgb_controllers_sizes, size_used, rgb_controllers_hw[controller_size_idx], true, false);
} }