Don't end up killing init if process selected to be killed terminates before the user selects a signal. Closes #3606072.

1 files changed, 8 insertions, 3 deletions

diff --git a/htop.c b/htop.c
index cdee8eeb..de9df527 100644
--- a/htop.c
+++ b/htop.c
@@ -217,9 +217,10 @@ static Object* pickFromVector(Panel* panel, Panel* list, int x, int y, const cha
    Panel* panelFocus;
    int ch;
    bool unfollow = false;
+   Process* p = (Process*)Panel_getSelected(panel);
+   int pid = p ? p->pid : -1;
    if (header->pl->following == -1) {
-      Process* p = (Process*)Panel_getSelected(panel);
-      header->pl->following = p ? p->pid : -1;
+      header->pl->following = pid;
       unfollow = true;
    }
    ScreenManager_run(scr, &panelFocus, &ch);
@@ -231,7 +232,11 @@ static Object* pickFromVector(Panel* panel, Panel* list, int x, int y, const cha
    Panel_resize(panel, COLS, LINES-y-1);
    FunctionBar_draw(prevBar, NULL);
    if (panelFocus == list && ch == 13) {
-      return Panel_getSelected(list);
+      Process* selected = (Process*)Panel_getSelected(panel);
+      if (selected->pid == pid)
+         return Panel_getSelected(list);
+      else
+         beep();
    }
    return NULL;
 }