diff options
| author | Dan McDonald <danmcd@joyent.com> | 2020-09-22 10:39:49 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2020-09-22 10:39:49 -0400 |
| commit | 267e12a7d9bf6e5fcefb9cc00f46bfff0dc5226e (patch) | |
| tree | 19a3941920d0039c35d53a5cbee189b5ca51995a /usr/src/common/font/font.c | |
| parent | 517abc5c668925e6092495bf332233c3599980d2 (diff) | |
| parent | e9faba760cdf80d7dfa110fe0830917ab94668c2 (diff) | |
| download | illumos-joyent-vpc.tar.gz | |
Merge branch 'master' into vpcvpc
Diffstat (limited to 'usr/src/common/font/font.c')
| -rw-r--r-- | usr/src/common/font/font.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/common/font/font.c b/usr/src/common/font/font.c index 3556f27cf8..f46c34a988 100644 --- a/usr/src/common/font/font.c +++ b/usr/src/common/font/font.c @@ -222,7 +222,8 @@ set_font(short *rows, short *cols, short h, short w) font = fl->font_data; if ((((*rows * font->height) + BORDER_PIXELS) <= height) && (((*cols * font->width) + BORDER_PIXELS) <= width)) { - if (font->font == NULL) { + if (font->font == NULL || + fl->font_flags == FONT_RELOAD) { if (fl->font_load != NULL && fl->font_name != NULL) { font = fl->font_load(fl->font_name); |