[syslinux:elflink] elflink: Do clear screen even if we have no pDraw_Menu method

syslinux-bot for Liu Aleaxander Aleaxander at gmail.com
Fri Mar 18 11:30:41 PDT 2011


Commit-ID:  21859f75289aa2f28c8c6ddfbfea481bac631ecd
Gitweb:     http://syslinux.zytor.com/commit/21859f75289aa2f28c8c6ddfbfea481bac631ecd
Author:     Liu Aleaxander <Aleaxander at gmail.com>
AuthorDate: Tue, 15 Mar 2011 20:28:26 +0000
Committer:  Matt Fleming <matt.fleming at linux.intel.com>
CommitDate: Tue, 15 Mar 2011 21:14:48 +0000

elflink: Do clear screen even if we have no pDraw_Menu method

Do clear screen even if we have no pDraw_Menu method, since user
may work in CLI mode and want to clear screen by pressing 'Ctrl-L'.

Signed-off-by: Liu Aleaxander <Aleaxander at gmail.com>
Signed-off-by: Matt Fleming <matt.fleming at linux.intel.com>


---
 com32/elflink/ldlinux/cli.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/com32/elflink/ldlinux/cli.c b/com32/elflink/ldlinux/cli.c
index b35e958..7a68545 100644
--- a/com32/elflink/ldlinux/cli.c
+++ b/com32/elflink/ldlinux/cli.c
@@ -98,14 +98,13 @@ const char *edit_cmdline(const char *input, int top /*, int width */ ,
     x = y = 0;
 
     while (!done) {
-	if (redraw > 1 && pDraw_Menu != NULL) {
+	if (redraw > 1) {
 	    /* Clear and redraw whole screen */
 	    /* Enable ASCII on G0 and DEC VT on G1; do it in this order
 	       to avoid confusing the Linux console */
-	    /* clear_screen();
-	       draw_menu(-1, top, 1); */
 	    clear_screen();
-	    (*pDraw_Menu) (-1, top, 1);
+	    if (pDraw_Menu)
+		    (*pDraw_Menu) (-1, top, 1);
 	    prev_len = 0;
 	    // printf("\033[0m\033[2J\033[H");
 	}



More information about the Syslinux-commits mailing list