summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSadrul Habib Chowdhury <sadrul@users.sourceforge.net>2010-03-04 18:09:17 -0500
committerSadrul Habib Chowdhury <sadrul@users.sourceforge.net>2010-03-04 18:09:17 -0500
commit824d21489434e94591d9565240ec21fa80173ba4 (patch)
tree7854b320d716cbf5e77bce765906a41259d666ab
parent30be3fc3a160a0a8c7c1d7190dbc0177f2d9e34f (diff)
downloadscreen-824d21489434e94591d9565240ec21fa80173ba4.tar.gz
Fix terminating an on-window list.
-rw-r--r--src/list_window.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/list_window.c b/src/list_window.c
index df83578..21ca837 100644
--- a/src/list_window.c
+++ b/src/list_window.c
@@ -300,7 +300,7 @@ gl_Window_input(struct ListData *ldata, char **inp, int *len)
if (display && AclCheckPermWin(D_user, ACL_READ, win))
return; /* Not allowed to switch to this window. */
#endif
- if (!wdata->group)
+ if (wdata->onblank || (!wdata->onblank && wdata->group))
{
/* Do not abort the group window. */
glist_abort();
@@ -406,14 +406,13 @@ gl_Window_input(struct ListData *ldata, char **inp, int *len)
case 033: /* escape */
case 007: /* ^G */
- if (wdata->group)
- break; /* Do nothing if it's a group window */
- if (wdata->onblank)
+ if (wdata->onblank || (!wdata->onblank && wdata->group))
{
int fnumber = wdata->fore->w_number;
glist_abort();
display = cd;
- SwitchWindow(fnumber);
+ if (wdata->onblank)
+ SwitchWindow(fnumber);
*len = 0;
break;
}