diff options
author | Samuel Mendoza-Jonas <sam.mj@au1.ibm.com> | 2015-09-02 15:43:39 +1000 |
---|---|---|
committer | Samuel Mendoza-Jonas <sam.mj@au1.ibm.com> | 2015-09-07 16:55:52 +1000 |
commit | 9384b0ab3b9bec1744c19c64ac5431db99110b04 (patch) | |
tree | b5fed2d89b6a3cc20a10e9cbc007913dae09b1e8 /ui/ncurses/nc-sysinfo.c | |
parent | 72148c718113a17d80fd1da3c8dd82b471bed07a (diff) | |
download | talos-petitboot-9384b0ab3b9bec1744c19c64ac5431db99110b04.tar.gz talos-petitboot-9384b0ab3b9bec1744c19c64ac5431db99110b04.zip |
ui/ncurses: Improve update handling in nested screens
Several screens in petitboot-nc require an update if a config or sysinfo
update is received. However if those screens exist but are not the
current screen they will incorrectly try to draw to the screen.
Where the currently active screen is a textscreen (eg. a help screen)
the update is delayed until after the screen is exited.
In the particular case of nc-config where the current screen can be an
nc-subset screen, the nc-subset screen is exited immediately so the
update can be performed, since the nc-subset screen depends on the
information in the previous screen.
Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
Diffstat (limited to 'ui/ncurses/nc-sysinfo.c')
-rw-r--r-- | ui/ncurses/nc-sysinfo.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/ncurses/nc-sysinfo.c b/ui/ncurses/nc-sysinfo.c index bde8b33..ac8ece7 100644 --- a/ui/ncurses/nc-sysinfo.c +++ b/ui/ncurses/nc-sysinfo.c @@ -104,7 +104,11 @@ void sysinfo_screen_update(struct sysinfo_screen *screen, const struct system_info *sysinfo) { sysinfo_screen_populate(screen, sysinfo); - text_screen_draw(&screen->text_scr); + + if (screen->text_scr.cui->help_screen) + screen->text_scr.need_update = true; + else + text_screen_draw(&screen->text_scr); } struct sysinfo_screen *sysinfo_screen_init(struct cui *cui, |