Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2020-04-14 00:01:41 +01:00
33 changed files with 250 additions and 258 deletions

View File

@ -151,7 +151,7 @@ spawn_window(struct spawn_context *sc, char **cause)
xasprintf(cause, "couldn't add window %d", idx);
return (NULL);
}
default_window_size(sc->c, s, NULL, &sx, &sy, &xpixel, &ypixel,
default_window_size(sc->tc, s, NULL, &sx, &sy, &xpixel, &ypixel,
-1);
if ((w = window_create(sx, sy, xpixel, ypixel)) == NULL) {
winlink_remove(&s->windows, sc->wl);
@ -161,7 +161,7 @@ spawn_window(struct spawn_context *sc, char **cause)
if (s->curw == NULL)
s->curw = sc->wl;
sc->wl->session = s;
w->latest = sc->c;
w->latest = sc->tc;
winlink_set_window(sc->wl, w);
} else
w = NULL;