diff options
| author | Drew DeVault <sir@cmpwn.com> | 2016-03-30 11:19:12 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2016-03-30 11:19:12 -0400 |
| commit | 96ef3f69c4b8e1e3e7a3bd376ee2e3799470e7e7 (patch) | |
| tree | 9a049e6ac802b30247fddf6606902106a3821126 /sway/commands.c | |
| parent | 655b003062cd5cf81d6de2f2c486d9b81177bb79 (diff) | |
| parent | 63474aa04d267391575249321820b1dd1ae4f980 (diff) | |
Merge pull request #557 from mikkeloscar/bar-font-pango-optional
Make pango: optional for bar font
Diffstat (limited to 'sway/commands.c')
| -rw-r--r-- | sway/commands.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sway/commands.c b/sway/commands.c index c621fa92..381c0133 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -2263,14 +2263,14 @@ static struct cmd_results *bar_cmd_font(int argc, char **argv) { } char *font = join_args(argv, argc); + free(config->current_bar->font); if (strlen(font) > 6 && strncmp("pango:", font, 6) == 0) { - free(config->current_bar->font); config->current_bar->font = font; - sway_log(L_DEBUG, "Settings font '%s' for bar: %s", config->current_bar->font, config->current_bar->id); } else { - sway_log(L_ERROR, "warning: non-pango font '%s' not supported.", font); + config->current_bar->font = font; } + sway_log(L_DEBUG, "Settings font '%s' for bar: %s", config->current_bar->font, config->current_bar->id); return cmd_results_new(CMD_SUCCESS, NULL, NULL); } |