summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--alpine/mailcmd.c15
-rw-r--r--pith/pine.hlp5
2 files changed, 16 insertions, 4 deletions
diff --git a/alpine/mailcmd.c b/alpine/mailcmd.c
index c0167b87..ed93348d 100644
--- a/alpine/mailcmd.c
+++ b/alpine/mailcmd.c
@@ -8952,6 +8952,7 @@ choose_a_rule(int rflags)
int cnt = 0;
PAT_S *pat;
PAT_STATE pstate;
+ void (*redraw)(void) = ps_global->redrawer;
if(!(nonempty_patterns(rflags, &pstate) && first_pattern(&pstate))){
q_status_message(SM_ORDER, 3, 3,
@@ -8985,8 +8986,10 @@ choose_a_rule(int rflags)
_("rules"), h_select_rule_screen,
_("HELP FOR SELECTING A RULE NICKNAME"), NULL);
- if(!choice)
+ if(!choice){
q_status_message(SM_ORDER, 1, 4, "No choice");
+ ps_global->redrawer = redraw;
+ }
free_list_array(&rule_list);
@@ -9169,6 +9172,7 @@ choose_a_keyword(void)
char **keyword_list, **lp;
int cnt;
KEYWORD_S *kw;
+ void (*redraw)(void) = ps_global->redrawer;
/*
* Build a list of keywords to choose from.
@@ -9196,8 +9200,10 @@ choose_a_keyword(void)
_("keywords"), h_select_keyword_screen,
_("HELP FOR SELECTING A KEYWORD"), NULL);
- if(!choice)
+ if(!choice){
q_status_message(SM_ORDER, 1, 4, "No choice");
+ ps_global->redrawer = redraw;
+ }
free_list_array(&keyword_list);
@@ -9276,6 +9282,7 @@ choose_a_charset(int which_charsets)
char **charset_list, **lp;
const CHARSET *cs;
int cnt;
+ void (*redraw)(void) = ps_global->redrawer;
/*
* Build a list of charsets to choose from.
@@ -9319,8 +9326,10 @@ choose_a_charset(int which_charsets)
_("character sets"), h_select_charset_screen,
_("HELP FOR SELECTING A CHARACTER SET"), NULL);
- if(!choice)
+ if(!choice){
q_status_message(SM_ORDER, 1, 4, "No choice");
+ ps_global->redrawer = redraw;
+ }
free_list_array(&charset_list);
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 23403143..9a252bba 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -147,7 +147,7 @@ with help text for the config screen and the composer that didn't have any
reasonable place to be called from.
Dummy change to get revision in pine.hlp
============= h_revision =================
-Alpine Commit 661 2022-09-03 07:46:35
+Alpine Commit 662 2022-09-08 22:05:03
============= h_news =================
<HTML>
<HEAD>
@@ -205,6 +205,9 @@ new additions to Alpine, please check it periodically.
<P> Bugs addressed include:
<UL>
<LI> Crash in PC-Alpine when postponing a message. Reported by Paolo Ienne.
+<LI> Crash in Alpine after a user tried to repaint the screen after failing
+ to select a rule from a menu. Reported by Peter Tirsek. Crash also
+ reproducible when selecting by keyword or charset.
</UL>
<P>Version 2.26 adds new features and addresses bugs found in previous