diff options
| author | Daniel Lange <DLange@git.local> | 2021-02-09 09:13:32 +0100 |
|---|---|---|
| committer | Daniel Lange <DLange@git.local> | 2021-02-09 09:13:32 +0100 |
| commit | 3e4e13c5845b7e145c4c74d72e4c010ddb0620cd (patch) | |
| tree | 6b5dedd06ec3e084dfbf3a9b32ed53b13d47eff7 | |
| parent | a26143e3a68bc137d0d8c922a0b7fa16461c1755 (diff) | |
| download | debian_htop-3e4e13c5845b7e145c4c74d72e4c010ddb0620cd.tar.gz debian_htop-3e4e13c5845b7e145c4c74d72e4c010ddb0620cd.tar.bz2 debian_htop-3e4e13c5845b7e145c4c74d72e4c010ddb0620cd.zip | |
Backport "Remove force sort order to ASC when returning to tree mode"
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/0012-fix-forced-sort-order.patch | 22 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 29 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index b0946b4..3c6538a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +htop (3.0.5-5) UNRELEASED; urgency=medium + + * Fix forced sort order when switching to tree mode + + -- Daniel Lange <DLange@debian.org> Tue, 09 Feb 2021 09:10:36 +0100 + htop (3.0.5-4) unstable; urgency=medium * Fix mouse use / scrolling in Infoscreens diff --git a/debian/patches/0012-fix-forced-sort-order.patch b/debian/patches/0012-fix-forced-sort-order.patch new file mode 100644 index 0000000..fcc667f --- /dev/null +++ b/debian/patches/0012-fix-forced-sort-order.patch @@ -0,0 +1,22 @@ +From e86acd6893c17165b8b889bea122a283b9c09fe7 Mon Sep 17 00:00:00 2001 +From: Daniel Lange <DLange@git.local> +Date: Sun, 7 Feb 2021 13:46:57 +0100 +Subject: [PATCH] Remove force sort order to ASC when returning to tree mode + +Bug found by BenBE via IRC +--- + Action.c | 3 --- + 1 file changed, 3 deletions(-) + +--- a/Action.c ++++ b/Action.c +@@ -227,9 +227,6 @@ + + static Htop_Reaction actionToggleTreeView(State* st) { + st->settings->treeView = !st->settings->treeView; +- if (st->settings->treeView) { +- st->settings->treeDirection = 1; +- } + + ProcessList_expandTree(st->pl); + return HTOP_REFRESH | HTOP_SAVE_SETTINGS | HTOP_KEEP_FOLLOWING | HTOP_REDRAW_BAR | HTOP_UPDATE_PANELHDR; diff --git a/debian/patches/series b/debian/patches/series index 400b378..5403fbc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,4 @@ 0009-hardening.patch 0010-fix-sort-timeout.patch 0011-improve-setup-for-many-cpu-systems.patch +0012-fix-forced-sort-order.patch |