summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorTingPing <tingping@tingping.se>2015-01-13 04:14:32 -0500
committerTingPing <tingping@tingping.se>2015-01-13 04:14:32 -0500
commitaab243592f9a72682216dfeeaa891200a79ac0a1 (patch)
treea9d57cb8525e0279f233e826cb1865576192e852 /src
parent13db2011e3b83e7a73b8465c8487edb9a2913c58 (diff)
Workaround crash when timestamp format is blank
Somebody else can fix the numerous assumptions elsewhere
Diffstat (limited to 'src')
-rw-r--r--src/fe-gtk/setup.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c
index e3969ff3..6d06a0fa 100644
--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@@ -2132,6 +2132,13 @@ setup_apply (struct hexchatprefs *pr)
 						" menu first."),
 						FE_MSG_WARN | FE_MSG_MARKUP);
 
+	/* format cannot be blank, there is already a setting for this */
+	if (pr->hex_stamp_text_format[0] == 0)
+	{
+		pr->hex_stamp_text = 0;
+		strcpy (pr->hex_stamp_text_format, prefs.hex_stamp_text_format);
+	}
+
 	memcpy (&prefs, pr, sizeof (prefs));
 
 #ifdef WIN32