From 0939e5cb4139a873f4338a4a9d497e6b38181ca4 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Fri, 24 Aug 2018 16:23:20 -0300 Subject: Settings: fix default and storage of sort keys --- Settings.c | 5 ++++- linux/Platform.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Settings.c b/Settings.c index 817fbc15..a7f20ebb 100644 --- a/Settings.c +++ b/Settings.c @@ -216,6 +216,9 @@ static void Settings_defaultMeters(Settings* this) { } static const char* toFieldName(int i) { + if (i < 0 || i > LAST_PROCESSFIELD) { + return ""; + } return Process_fields[i].name; } @@ -275,7 +278,7 @@ static void Settings_defaultScreens(Settings* this) { for (unsigned int i = 0; i < Platform_numberOfDefaultScreens; i++) { ScreenDefaults* defaults = &Platform_defaultScreens[i]; Settings_newScreen(this, defaults->name, defaults->columns); - this->screens[0]->sortKey = toFieldIndex(defaults->sortKey); + this->screens[i]->sortKey = toFieldIndex(defaults->sortKey); } } diff --git a/linux/Platform.c b/linux/Platform.c index 7efc7e47..cfaa0f14 100644 --- a/linux/Platform.c +++ b/linux/Platform.c @@ -101,7 +101,7 @@ ScreenDefaults Platform_defaultScreens[] = { { .name = "L1 Data Cache", .columns = "PID USER PERCENT_CPU L1DREADS L1DRMISSES L1DWRITES L1DWMISSES Command", - .sortKey = "LD1READS", + .sortKey = "L1DREADS", }, }; -- cgit v1.2.3