circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-13 18:38:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2015-12-28 16:01:09 +00:00
commit 5dd0e82809
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
screen.c
View File

@ -94,10 +94,10 @@ screen_set_cursor_style(struct screen *s, u_int style)
/* Set screen cursor colour. */ /* Set screen cursor colour. */
void 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); free(s->ccolour);
s->ccolour = xstrdup(colour_string); s->ccolour = xstrdup(colour);
} }
/* Set screen title. */ /* Set screen title. */

2
tty.c
View File

@ -491,7 +491,7 @@ tty_update_mode(struct tty *tty, int mode, struct screen *s)
{ {
int changed; 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); tty_force_cursor_colour(tty, s->ccolour);
if (tty->flags & TTY_NOCURSOR) if (tty->flags & TTY_NOCURSOR)