From 4c0a8d0376d0e6de6064f9aace79f610ecb80e79 Mon Sep 17 00:00:00 2001
From: Timothy Stack <timothyshanestack@gmail.com>
Date: Fri, 4 Nov 2016 11:00:51 -0700
Subject: [PATCH] [ptime] need to clear the zone from the base when using a
 custom time format

---
 src/lnav_util.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/lnav_util.cc b/src/lnav_util.cc
index 74d64427..45636e56 100644
--- a/src/lnav_util.cc
+++ b/src/lnav_util.cc
@@ -572,6 +572,11 @@ const char *date_time_scanner::scan(const char *time_dest,
         else {
             off_t off = 0;
 
+#ifdef HAVE_STRUCT_TM_TM_ZONE
+            if (!this->dts_keep_base_tz) {
+                tm_out->et_tm.tm_zone = NULL;
+            }
+#endif
             if (ptime_fmt(time_fmt[curr_time_fmt], tm_out, time_dest, off, time_len)) {
                 retval = &time_dest[off];
                 if (tm_out->et_tm.tm_year < 70) {