04/04: installer: page: Improve error handling.

[Danny Milosavljevic]

dannym pushed a commit to branch wip-installer-2
in repository guix.

commit 7c62b1d04ca89afdfe4d074904bf920477b2b8b2
Author: Danny Milosavljevic <address@hidden>
Date:   Tue Jul 4 22:05:36 2017 +0200

    installer: page: Improve error handling.
    
    * gnu/system/installer/page.scm (page-default-key-handler): Modify.
---
 gnu/system/installer/page.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/system/installer/page.scm b/gnu/system/installer/page.scm
index 80905e0..55a9d70 100644
--- a/gnu/system/installer/page.scm
+++ b/gnu/system/installer/page.scm
@@ -112,13 +112,12 @@ If a form is used it's assumed that the menu is not used 
and vice versa."
         (if nav
             (buttons-select nav 0)))
 
-       ((eqv? (buttons-selected nav) (1- (buttons-n-buttons nav)))
+       ((and nav (eqv? (buttons-selected nav) (1- (buttons-n-buttons nav))))
         (if menu
           (menu-set-active! menu #t)
           (if form
             (form-set-enabled! form #t)))
-        (if nav
-            (buttons-unselect-all nav)))
+        (buttons-unselect-all nav))
 
        (else
         (if nav
@@ -152,7 +151,8 @@ If a form is used it's assumed that the menu is not used 
and vice versa."
 
      (else
       (if form
-          (form-enter form ch))))))
+          (form-enter form ch)
+          'ignored)))))
 
 
 (define* (make-page surface title refresh cursor-visibility