From d2d43987d0f35af2bc012f1260fdb81c851fe390 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 18 Mar 2019 09:46:42 +0000
Subject: [PATCH] With force, kill previous job before starting new. Fixes
 problem reported by Scott Mcdermott in GitHub issue 1627.

---
 format.c | 4 +++-
 status.c | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/format.c b/format.c
index bcc31d3c..aa0a8aa2 100644
--- a/format.c
+++ b/format.c
@@ -346,7 +346,9 @@ format_job_get(struct format_tree *ft, const char *cmd)
 		force = (ft->flags & FORMAT_FORCE);
 
 	t = time(NULL);
-	if (fj->job == NULL && (force || fj->last != t)) {
+	if (force && fj->job != NULL)
+	       job_free(fj->job);
+	if (force || (fj->job == NULL && fj->last != t)) {
 		fj->job = job_run(expanded, NULL,
 		    server_client_get_cwd(ft->client, NULL), format_job_update,
 		    format_job_complete, NULL, fj, JOB_NOWAIT);
diff --git a/status.c b/status.c
index 5a6a4466..4a2eb19d 100644
--- a/status.c
+++ b/status.c
@@ -704,7 +704,7 @@ status_message_redraw(struct client *c)
 	lines = status_line_size(c);
 	if (lines <= 1)
 		lines = 1;
-	screen_init(sl->active, c->tty.sx, 1, 0);
+	screen_init(sl->active, c->tty.sx, lines, 0);
 
 	len = screen_write_strlen("%s", c->message_string);
 	if (len > c->tty.sx)