From 3243268ab42420a032107bb7fd5b4db242f4062b Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Sun, 21 Feb 2021 10:37:44 +0100 Subject: Add clean infoscreen patch, release 3.0.5-6 --- debian/changelog | 6 ++++ .../0015-clean-infoscreen-before-new-scan.patch | 35 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 42 insertions(+) create mode 100644 debian/patches/0015-clean-infoscreen-before-new-scan.patch diff --git a/debian/changelog b/debian/changelog index d5c21ee..2249a97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +htop (3.0.5-6) unstable; urgency=medium + + * Fix cleaning the infoscreen before a next scan + + -- Daniel Lange Mon, 01 Mar 2021 09:00:00 +0100 + htop (3.0.5-5) unstable; urgency=medium * Fix forced sort order when switching to tree mode diff --git a/debian/patches/0015-clean-infoscreen-before-new-scan.patch b/debian/patches/0015-clean-infoscreen-before-new-scan.patch new file mode 100644 index 0000000..8ba234c --- /dev/null +++ b/debian/patches/0015-clean-infoscreen-before-new-scan.patch @@ -0,0 +1,35 @@ +From d8d83031d9d42d64e89388c842056031c6dad27c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=98ystein=20Hi=C3=A5sen?= +Date: Mon, 15 Feb 2021 20:32:01 +0100 +Subject: [PATCH] InfoScreen: Remove old lines before scanning again + +--- + InfoScreen.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +--- a/InfoScreen.c ++++ b/InfoScreen.c +@@ -145,8 +145,10 @@ + break; + case KEY_F(5): + clear(); +- if (As_InfoScreen(this)->scan) ++ if (As_InfoScreen(this)->scan) { ++ Vector_prune(this->lines); + InfoScreen_scan(this); ++ } + + InfoScreen_draw(this); + break; +@@ -161,8 +163,10 @@ + break; + case KEY_RESIZE: + Panel_resize(panel, COLS, LINES - 2); +- if (As_InfoScreen(this)->scan) ++ if (As_InfoScreen(this)->scan) { ++ Vector_prune(this->lines); + InfoScreen_scan(this); ++ } + + InfoScreen_draw(this); + break; diff --git a/debian/patches/series b/debian/patches/series index b60958a..cd10755 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,3 +12,4 @@ 0012-fix-forced-sort-order.patch 0013-fix-btime-zero.patch 0014-fix-zfs-coloring.patch +0015-clean-infoscreen-before-new-scan.patch -- cgit v1.2.3