From c711dbc6335869cedfb4fb0c09d71985dd0423c1 Mon Sep 17 00:00:00 2001
From: Explorer09 <explorer09@gmail.com>
Date: Tue, 16 Apr 2024 20:18:08 +0800
Subject: CPUMeter: Read height from sub-meter objects

The Meter objects have their own 'h' properties.
Avoid access to the `Meter_modes` array.

Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
---
 CPUMeter.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CPUMeter.c b/CPUMeter.c
index 2f777b2e..58f4455d 100644
--- a/CPUMeter.c
+++ b/CPUMeter.c
@@ -9,6 +9,7 @@ in the source distribution for its full text.
 
 #include "CPUMeter.h"
 
+#include <assert.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -256,12 +257,13 @@ static void CPUMeterCommonUpdateMode(Meter* this, int mode, int ncol) {
    CPUMeterData* data = this->meterData;
    Meter** meters = data->meters;
    this->mode = mode;
-   int h = Meter_modes[mode]->h;
    int start, count;
    AllCPUsMeter_getRange(this, &start, &count);
    for (int i = 0; i < count; i++) {
       Meter_setMode(meters[i], mode);
    }
+   int h = meters[0]->h;
+   assert(h > 0);
    this->h = h * ((count + ncol - 1) / ncol);
 }
 
-- 
cgit v1.2.3