diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-06-20 15:02:26 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-06-20 15:02:26 +0100 |
| commit | f8ad72b2eeafc1146c116f73194a3950aa0c2143 (patch) | |
| tree | 98b47921006cbb3e96d98fc8214824ec130e364e /format.c | |
| parent | a0e2c1b4cae9269d04ee2e80e1d1cb8adc78cd8a (diff) | |
| parent | 5f92f92908b81b4ec66682adb84b9ffc8d83c2f7 (diff) | |
| download | rtmux-f8ad72b2eeafc1146c116f73194a3950aa0c2143.tar.gz rtmux-f8ad72b2eeafc1146c116f73194a3950aa0c2143.tar.bz2 rtmux-f8ad72b2eeafc1146c116f73194a3950aa0c2143.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'format.c')
| -rw-r--r-- | format.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1068,6 +1068,8 @@ format_find(struct format_tree *ft, const char *key, int modifiers) if (~modifiers & FORMAT_TIMESTRING) { o = options_parse_get(global_options, key, &idx, 0); + if (o == NULL && ft->wp != NULL) + o = options_parse_get(ft->wp->options, key, &idx, 0); if (o == NULL && ft->w != NULL) o = options_parse_get(ft->w->options, key, &idx, 0); if (o == NULL) |