zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Settings: fix default and storage of sort keys

This commit is contained in:
Hisham Muhammad 2018-08-24 16:23:20 -03:00
parent e1c2dc56fd
commit 0939e5cb41
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Settings.c
View File

@ -216,6 +216,9 @@ static void Settings_defaultMeters(Settings* this) {
} }
static const char* toFieldName(int i) { static const char* toFieldName(int i) {
if (i < 0 || i > LAST_PROCESSFIELD) {
return "";
}
return Process_fields[i].name; return Process_fields[i].name;
} }
@ -275,7 +278,7 @@ static void Settings_defaultScreens(Settings* this) {
for (unsigned int i = 0; i < Platform_numberOfDefaultScreens; i++) { for (unsigned int i = 0; i < Platform_numberOfDefaultScreens; i++) {
ScreenDefaults* defaults = &Platform_defaultScreens[i]; ScreenDefaults* defaults = &Platform_defaultScreens[i];
Settings_newScreen(this, defaults->name, defaults->columns); Settings_newScreen(this, defaults->name, defaults->columns);
this->screens[0]->sortKey = toFieldIndex(defaults->sortKey); this->screens[i]->sortKey = toFieldIndex(defaults->sortKey);
} }
} }

2
linux/Platform.c
View File

@ -101,7 +101,7 @@ ScreenDefaults Platform_defaultScreens[] = {
{ {
.name = "L1 Data Cache", .name = "L1 Data Cache",
.columns = "PID USER PERCENT_CPU L1DREADS L1DRMISSES L1DWRITES L1DWMISSES Command", .columns = "PID USER PERCENT_CPU L1DREADS L1DRMISSES L1DWRITES L1DWMISSES Command",
.sortKey = "LD1READS", .sortKey = "L1DREADS",
}, },
}; };