Commit bd459776 authored by Hisham Muhammad's avatar Hisham Muhammad
Browse files

retain meter state when it is reinit'ed in the Setup screen

parent b57b7e9a
......@@ -124,12 +124,15 @@ static void CPUMeter_display(Object* cast, RichString* out) {
static void AllCPUsMeter_init(Meter* this) {
int cpus = this->pl->cpuCount;
this->drawData = malloc(sizeof(Meter*) * cpus);
if (!this->drawData)
this->drawData = calloc(sizeof(Meter*), cpus);
Meter** meters = (Meter**) this->drawData;
for (int i = 0; i < cpus; i++)
meters[i] = Meter_new(this->pl, i+1, &CPUMeter);
this->h = cpus;
this->mode = BAR_METERMODE;
for (int i = 0; i < cpus; i++) {
if (!meters[i])
meters[i] = Meter_new(this->pl, i+1, &CPUMeter);
meters[i]->type->init(meters[i]);
}
this->h = Meter_modes[this->mode]->h;
}
static void AllCPUsMeter_done(Meter* this) {
......
......@@ -155,8 +155,9 @@ Meter* Meter_new(ProcessList* pl, int param, MeterType* type) {
}
void Meter_delete(Object* cast) {
if (!cast)
return;
Meter* this = (Meter*) cast;
assert (this != NULL);
if (this->type->done) {
this->type->done(this);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment