From 7271b076b82785ffca73ee9e4ae84cabb77018ee Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Wed, 10 Jan 2024 12:40:37 +0100 Subject: New upstream version 3.3.0 --- DynamicMeter.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'DynamicMeter.c') diff --git a/DynamicMeter.c b/DynamicMeter.c index a8cd76c..15d853b 100644 --- a/DynamicMeter.c +++ b/DynamicMeter.c @@ -15,10 +15,11 @@ in the source distribution for its full text. #include #include "CRT.h" +#include "Machine.h" #include "Object.h" #include "Platform.h" -#include "ProcessList.h" #include "RichString.h" +#include "Settings.h" #include "XUtils.h" @@ -88,16 +89,16 @@ static void DynamicMeter_display(const Object* cast, RichString* out) { } static const char* DynamicMeter_getCaption(const Meter* this) { - const ProcessList* pl = this->pl; - const DynamicMeter* meter = Hashtable_get(pl->dynamicMeters, this->param); + const Settings* settings = this->host->settings; + const DynamicMeter* meter = Hashtable_get(settings->dynamicMeters, this->param); if (meter) return meter->caption ? meter->caption : meter->name; return this->caption; } static void DynamicMeter_getUiName(const Meter* this, char* name, size_t length) { - const ProcessList* pl = this->pl; - const DynamicMeter* meter = Hashtable_get(pl->dynamicMeters, this->param); + const Settings* settings = this->host->settings; + const DynamicMeter* meter = Hashtable_get(settings->dynamicMeters, this->param); if (meter) { const char* uiName = meter->caption; if (uiName) { -- cgit v1.2.3