diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-05-31 21:55:09 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-05-31 21:55:09 -0700 |
| commit | f502c307fcace74e8c99774112016150e8a7a01a (patch) | |
| tree | bb653df246d37ae1f630f43be21bfe087186ab3b /core/abort.inc | |
| parent | 651fc2a11d8a95e8d8f9e5aa6f788c2b030499f4 (diff) | |
| parent | 327c0dadf173e09348b967746925e995b2b6dfaf (diff) | |
| download | syslinux-f502c307fcace74e8c99774112016150e8a7a01a.tar.gz | |
Merge branch 'master' into core32
Conflicts:
core/isolinux.asm
Diffstat (limited to 'core/abort.inc')
| -rw-r--r-- | core/abort.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/abort.inc b/core/abort.inc index d8a18883..9b181363 100644 --- a/core/abort.inc +++ b/core/abort.inc @@ -34,6 +34,7 @@ dot_pause: ; abort_check: let the user abort with <ESC> or <Ctrl-C> ; abort_check: + call reset_idle ; Not idle despite pollchar call pollchar jz .ret1 pusha |