diff options
| author | Drew DeVault <sir@cmpwn.com> | 2016-01-27 04:55:44 -0500 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2016-01-27 04:55:44 -0500 |
| commit | 3a4564a3670f11794a8f8de28b394bb7774610fd (patch) | |
| tree | d1f5bd624cf3dccc1987ccfc1fe20130a2d4cf4a /sway/ipc-server.c | |
| parent | baa958eaf2a727c1f8e72aa2606b4b975087939f (diff) | |
| parent | 0ee55474067364159f84806b7b0813492ed4e546 (diff) | |
Merge pull request #479 from crondog/font
font: Allow adding font to the config. In prep for border titles
Diffstat (limited to 'sway/ipc-server.c')
| -rw-r--r-- | sway/ipc-server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 58a291cd..63a6d703 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c @@ -551,7 +551,7 @@ json_object *ipc_json_describe_bar_config(struct bar_config *bar) { break; } json_object_object_add(json, "status_command", json_object_new_string(bar->status_command)); - json_object_object_add(json, "font", json_object_new_string(bar->font)); + json_object_object_add(json, "font", json_object_new_string(bar->font ? bar->font : config->font)); if (bar->separator_symbol) { json_object_object_add(json, "separator_symbol", json_object_new_string(bar->separator_symbol)); } |