Merge branch 'BenBE-avoid-shadowing'

This commit is contained in:
Nathan Scott 2020-09-09 19:41:16 +10:00
commit cd55cfd6d2

View File

@ -368,9 +368,9 @@ Panel* AffinityPanel_new(ProcessList* pl, Affinity* affinity, int* width) {
for (int i = 0; i < pl->cpuCount; i++) {
char number[16];
xSnprintf(number, 9, "CPU %d", Settings_cpuId(pl->settings, i));
unsigned width = 4 + strlen(number);
if (width > this->width)
this->width = width;
unsigned cpu_width = 4 + strlen(number);
if (cpu_width > this->width)
this->width = cpu_width;
bool isSet = false;
if (curCpu < affinity->used && affinity->cpus[curCpu] == i) {