From 61d4b8fa5dc537e5e79534e55f53000fce6c1ade Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Thu, 3 Dec 2020 01:03:44 -0600 Subject: [PATCH] More size loading fixes --- ProfileManager.cpp | 7 +++++-- ResourceManager.cpp | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ProfileManager.cpp b/ProfileManager.cpp index 35bf5368..d06b8274 100644 --- a/ProfileManager.cpp +++ b/ProfileManager.cpp @@ -194,6 +194,11 @@ bool ProfileManager::LoadDeviceFromListWithOptions &&(temp_controller->serial == load_controller->serial ) &&((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 | \*---------------------------------------------------------*/ @@ -263,8 +268,6 @@ bool ProfileManager::LoadDeviceFromListWithOptions } } - temp_controller_used[temp_index] = true; - return(true); } } diff --git a/ResourceManager.cpp b/ResourceManager.cpp index efe391ba..600d232f 100644 --- a/ResourceManager.cpp +++ b/ResourceManager.cpp @@ -502,7 +502,7 @@ void ResourceManager::DetectDevicesThreadFunction() /*-------------------------------------------------*\ | 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); } @@ -595,7 +595,7 @@ void ResourceManager::DetectDevicesThreadFunction() /*-------------------------------------------------*\ | 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); } @@ -724,7 +724,7 @@ void ResourceManager::DetectDevicesThreadFunction() /*-------------------------------------------------*\ | 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); }