moparisthebest/hexchat
1
0
Fork 0
mirror of https://github.com/moparisthebest/hexchat synced 2024-11-24 18:22:21 -05:00
Code Issues Releases Wiki Activity

Fix incorrect timestamp in scrollback with server-time

Browse Source 
Fixes #1148
This commit is contained in:
bendem 2015-03-02 19:58:27 +01:00
parent 658f30ec43
commit 36a8ba126c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/text.c
View File

@ -207,10 +207,9 @@ scrollback_shrink (session *sess)
} }
static void static void
scrollback_save (session *sess, char *text) scrollback_save (session *sess, char *text, time_t stamp)
{ {
char *buf; char *buf;
time_t stamp;
int len; int len;
if (sess->type == SESS_SERVER && prefs.hex_gui_tab_server == 1) if (sess->type == SESS_SERVER && prefs.hex_gui_tab_server == 1)
@ -238,7 +237,8 @@ scrollback_save (session *sess, char *text)
return; return;
} }
stamp = time (0); if (!stamp)
stamp = time(0);
if (sizeof (stamp) == 4) /* gcc will optimize one of these out */ if (sizeof (stamp) == 4) /* gcc will optimize one of these out */
buf = g_strdup_printf ("T %d ", (int) stamp); buf = g_strdup_printf ("T %d ", (int) stamp);
else else
@ -831,7 +831,7 @@ PrintTextTimeStamp (session *sess, char *text, time_t timestamp)
} }
log_write (sess, text, timestamp); log_write (sess, text, timestamp);
scrollback_save (sess, text); scrollback_save (sess, text, timestamp);
fe_print_text (sess, text, timestamp, FALSE); fe_print_text (sess, text, timestamp, FALSE);
g_free (text); g_free (text);
} }