diff options
| author | forsyth <forsyth@vitanuova.com> | 2010-04-25 16:18:38 +0100 |
|---|---|---|
| committer | forsyth <forsyth@vitanuova.com> | 2010-04-25 16:18:38 +0100 |
| commit | 79c08af73105929756ebec9f94a332c4dbfddd70 (patch) | |
| tree | f24b0cd87f9326c652c4fa5e48a6288d4cec611d | |
| parent | 34077fb06ba09ed1d81cf417aa57f71d91aae9a6 (diff) | |
20100425-1618
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | appl/wm/wm.b | 2 | ||||
| -rw-r--r-- | dis/wm/wm.dis | bin | 11213 -> 11262 bytes | |||
| -rw-r--r-- | include/version.h | 2 | ||||
| -rw-r--r-- | libtk/menus.c | 2 |
5 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,5 @@ +20100425 + appl/wm/wm.b shorten processing of wmctl close if client hadn't started 20100406 fix handling of boundary case in libtk/utils.c 20100402 diff --git a/appl/wm/wm.b b/appl/wm/wm.b index d2dee3f8..322cd072 100644 --- a/appl/wm/wm.b +++ b/appl/wm/wm.b @@ -154,6 +154,8 @@ init(ctxt: ref Draw->Context, argv: list of string) # if client leaving if(rc == nil){ c.remove(); + if(c.stop == nil) + break; if(c == ptrfocus) ptrfocus = nil; if(c == kbdfocus) diff --git a/dis/wm/wm.dis b/dis/wm/wm.dis Binary files differindex 3642c3e2..4251f0fe 100644 --- a/dis/wm/wm.dis +++ b/dis/wm/wm.dis diff --git a/include/version.h b/include/version.h index dce757a7..e4866d51 100644 --- a/include/version.h +++ b/include/version.h @@ -1 +1 @@ -#define VERSION "Fourth Edition (20100406)" +#define VERSION "Fourth Edition (20100425)" diff --git a/libtk/menus.c b/libtk/menus.c index ea02cef8..ac1d0e42 100644 --- a/libtk/menus.c +++ b/libtk/menus.c @@ -608,7 +608,7 @@ tkchoicevarchanged(Tk *tk, char *var, char *value) if(value[0] < '0' || value[0] > '9') return; v = atoi(value); - if(v < 0 || v > tkl->nvalues) + if(v < 0 || v >= tkl->nvalues) return; /* what else can we do? */ free(tkl->text); tkl->text = strdup(tkl->values[v]); |