diff options
| author | Graham Inggs <ginggs@debian.org> | 2018-02-05 14:48:53 +0200 |
|---|---|---|
| committer | Graham Inggs <ginggs@debian.org> | 2018-02-05 14:48:53 +0200 |
| commit | 0bffedf65c053726a3a09be93c5eabfc113550fc (patch) | |
| tree | 8c14970f1890c710df6f72aaa85781d62cee11e5 /MainPanel.c | |
| parent | ba3d665468e9752a81a50bb2df7639950e0a3c77 (diff) | |
| parent | 2ee50d030178cede83eb9d0005fbc19f819d30fe (diff) | |
| download | debian_htop-0bffedf65c053726a3a09be93c5eabfc113550fc.tar.gz debian_htop-0bffedf65c053726a3a09be93c5eabfc113550fc.tar.bz2 debian_htop-0bffedf65c053726a3a09be93c5eabfc113550fc.zip | |
Merge tag 'upstream/2.1.0'
Upstream version 2.1.0
Diffstat (limited to 'MainPanel.c')
| -rw-r--r-- | MainPanel.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/MainPanel.c b/MainPanel.c index 7aca7ed..b5a7e30 100644 --- a/MainPanel.c +++ b/MainPanel.c @@ -31,7 +31,7 @@ typedef bool(*MainPanel_ForeachProcessFn)(Process*, size_t); }*/ -static const char* MainFunctions[] = {"Help ", "Setup ", "Search", "Filter", "Tree ", "SortBy", "Nice -", "Nice +", "Kill ", "Quit ", NULL}; +static const char* const MainFunctions[] = {"Help ", "Setup ", "Search", "Filter", "Tree ", "SortBy", "Nice -", "Nice +", "Kill ", "Quit ", NULL}; void MainPanel_updateTreeFunctions(MainPanel* this, bool mode) { FunctionBar* bar = MainPanel_getFunctionBar(this); @@ -83,14 +83,14 @@ static HandlerResult MainPanel_eventHandler(Panel* super, int ch) { result = HANDLED; } else if (ch != ERR && this->inc->active) { bool filterChanged = IncSet_handleKey(this->inc, ch, super, (IncMode_GetPanelValue) MainPanel_getValue, NULL); - if (this->inc->found) { - reaction |= Action_follow(this->state); - } if (filterChanged) { this->state->pl->incFilter = IncSet_filter(this->inc); reaction = HTOP_REFRESH | HTOP_REDRAW_BAR; } - reaction |= HTOP_KEEP_FOLLOWING; + if (this->inc->found) { + reaction |= Action_follow(this->state); + reaction |= HTOP_KEEP_FOLLOWING; + } result = HANDLED; } else if (ch == 27) { return HANDLED; |