From 264942e483cd7a9cc5358bfe359bb644082fde6b Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Wed, 26 Oct 2005 14:15:31 +0000 Subject: [PATCH] Fixed vanishing text on preview with preset under condition SVN revision: 1534 --- src/elogd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/elogd.c b/src/elogd.c index cc9be322..9fd9d7e6 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -7808,7 +7808,7 @@ void rsicon(char *name, char *comment, char *elcode) /*------------------------------------------------------------------*/ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL bupload, BOOL breedit, - BOOL bduplicate, BOOL preview) + BOOL bduplicate, BOOL bpreview) { int i, j, n, index, aindex, size, width, height, fh, length, input_size, input_maxlen, format_flags[MAX_N_ATTR], year, month, day, hour, min, sec, n_attr, n_disp_attr, @@ -8883,7 +8883,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL } } - if (preview) { + if (bpreview) { _current_message_id = message_id; rsprintf("\n"); @@ -9086,7 +9086,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL preset_text = FALSE; /* user preset on reedit only if preset is under condition */ - if (breedit && getcfg(lbs->name, "Preset text", str, sizeof(str)) == 2) + if (breedit && !bpreview && !bupload && getcfg(lbs->name, "Preset text", str, sizeof(str)) == 2) preset_text = TRUE; }