Skip to content

Commit 61d4b8f

Browse files
More size loading fixes
1 parent 49fda96 commit 61d4b8f

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

ProfileManager.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,11 @@ bool ProfileManager::LoadDeviceFromListWithOptions
194194
&&(temp_controller->serial == load_controller->serial )
195195
&&((temp_controller->location == load_controller->location ) || (!compare_location)))
196196
{
197+
/*---------------------------------------------------------*\
198+
| Set used flag for this temp device |
199+
\*---------------------------------------------------------*/
200+
temp_controller_used[temp_index] = true;
201+
197202
/*---------------------------------------------------------*\
198203
| Update zone sizes if requested |
199204
\*---------------------------------------------------------*/
@@ -263,8 +268,6 @@ bool ProfileManager::LoadDeviceFromListWithOptions
263268
}
264269
}
265270

266-
temp_controller_used[temp_index] = true;
267-
268271
return(true);
269272
}
270273
}

ResourceManager.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ void ResourceManager::DetectDevicesThreadFunction()
502502
/*-------------------------------------------------*\
503503
| First, load sizes for the new controllers |
504504
\*-------------------------------------------------*/
505-
for(unsigned int controller_size_idx = prev_count - 1; controller_size_idx < rgb_controllers_hw.size(); controller_size_idx++)
505+
for(unsigned int controller_size_idx = prev_count; controller_size_idx < rgb_controllers_hw.size(); controller_size_idx++)
506506
{
507507
profile_manager->LoadDeviceFromListWithOptions(rgb_controllers_sizes, size_used, rgb_controllers_hw[controller_size_idx], true, false);
508508
}
@@ -595,7 +595,7 @@ void ResourceManager::DetectDevicesThreadFunction()
595595
/*-------------------------------------------------*\
596596
| First, load sizes for the new controllers |
597597
\*-------------------------------------------------*/
598-
for(unsigned int controller_size_idx = prev_count - 1; controller_size_idx < rgb_controllers_hw.size(); controller_size_idx++)
598+
for(unsigned int controller_size_idx = prev_count; controller_size_idx < rgb_controllers_hw.size(); controller_size_idx++)
599599
{
600600
profile_manager->LoadDeviceFromListWithOptions(rgb_controllers_sizes, size_used, rgb_controllers_hw[controller_size_idx], true, false);
601601
}
@@ -724,7 +724,7 @@ void ResourceManager::DetectDevicesThreadFunction()
724724
/*-------------------------------------------------*\
725725
| First, load sizes for the new controllers |
726726
\*-------------------------------------------------*/
727-
for(unsigned int controller_size_idx = prev_count - 1; controller_size_idx < rgb_controllers_hw.size(); controller_size_idx++)
727+
for(unsigned int controller_size_idx = prev_count; controller_size_idx < rgb_controllers_hw.size(); controller_size_idx++)
728728
{
729729
profile_manager->LoadDeviceFromListWithOptions(rgb_controllers_sizes, size_used, rgb_controllers_hw[controller_size_idx], true, false);
730730
}

0 commit comments

Comments
 (0)