Index: gpu/config/gpu_control_list.cc |
diff --git a/gpu/config/gpu_control_list.cc b/gpu/config/gpu_control_list.cc |
index a59d3ebd05487a44c455e3f2b149ed7e7a22ec45..b903399dc8f7d244231de31543dc9b0a2f94a320 100644 |
--- a/gpu/config/gpu_control_list.cc |
+++ b/gpu/config/gpu_control_list.cc |
@@ -1152,7 +1152,7 @@ bool GpuControlList::GpuControlListEntry::Contains( |
if (gpu_info.gpu.active || gpu_info.secondary_gpus.empty()) |
candidates.push_back(gpu_info.gpu); |
for (size_t ii = 0; ii < gpu_info.secondary_gpus.size(); ++ii) { |
- if (gpu_info.secondary_gpus[ii].active) |
+ if (gpu_info.secondary_gpus[ii].active || candidates.empty()) |
Zhenyao Mo
2016/02/22 17:05:21
This logic doesn't look right.
It should be after
|
candidates.push_back(gpu_info.secondary_gpus[ii]); |
} |
default: |