aboutsummaryrefslogtreecommitdiff
path: root/format.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2021-10-05 16:01:13 +0100
committerThomas Adam <thomas@xteddy.org>2021-10-05 16:01:13 +0100
commit479c9563c70343af7c8afc3f6bd02599d1fd1269 (patch)
tree2ffd9e20602a3a73d6556151c9d36f1bc92881a4 /format.c
parentbf595a0cb0eb132b7365e8f1d19f07b255cbf191 (diff)
parent9f6164a05cc0de372f6859127f72c8b242596bf5 (diff)
downloadrtmux-479c9563c70343af7c8afc3f6bd02599d1fd1269.tar.gz
rtmux-479c9563c70343af7c8afc3f6bd02599d1fd1269.tar.bz2
rtmux-479c9563c70343af7c8afc3f6bd02599d1fd1269.zip
Merge branch 'obsd-master' into master
Diffstat (limited to 'format.c')
-rw-r--r--format.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/format.c b/format.c
index 178102cc..e6d5dac9 100644
--- a/format.c
+++ b/format.c
@@ -3327,7 +3327,7 @@ format_find(struct format_tree *ft, const char *key, int modifiers,
fte = format_table_get(key);
if (fte != NULL) {
value = fte->cb(ft);
- if (fte->type == FORMAT_TABLE_TIME)
+ if (fte->type == FORMAT_TABLE_TIME && value != NULL)
t = ((struct timeval *)value)->tv_sec;
else
found = value;