Merge branch 'obsd-master'

2 files changed, 3 insertions, 3 deletions

diff --git a/screen.c b/screen.c
index 5551bb93..db9f52a6 100644
--- a/screen.c
+++ b/screen.c
@@ -94,10 +94,10 @@ screen_set_cursor_style(struct screen *s, u_int style)
 
 /* Set screen cursor colour. */
 void
-screen_set_cursor_colour(struct screen *s, const char *colour_string)
+screen_set_cursor_colour(struct screen *s, const char *colour)
 {
 	free(s->ccolour);
-	s->ccolour = xstrdup(colour_string);
+	s->ccolour = xstrdup(colour);
 }
 
 /* Set screen title. */
diff --git a/tty.c b/tty.c
index da5eac4d..304e1378 100644
--- a/tty.c
+++ b/tty.c
@@ -491,7 +491,7 @@ tty_update_mode(struct tty *tty, int mode, struct screen *s)
 {
 	int	changed;
 
-	if (s != NULL && strcmp(s->ccolour, tty->ccolour))
+	if (s != NULL && strcmp(s->ccolour, tty->ccolour) != 0)
 		tty_force_cursor_colour(tty, s->ccolour);
 
 	if (tty->flags & TTY_NOCURSOR)