aboutsummaryrefslogtreecommitdiff
path: root/gnu/installer.scm
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2021-01-12 16:26:07 +0100
committerMathieu Othacehe <othacehe@gnu.org>2021-01-12 16:40:27 +0100
commitbb4e67415eb6d9871ee1b50b0a01e08c19f4809a (patch)
tree11b6f0c7386119f69f387ed090c9d13e90b9c3c4 /gnu/installer.scm
parent55157c90711662c24c7627189020e3a5aeafa2ba (diff)
downloadguix-bb4e67415eb6d9871ee1b50b0a01e08c19f4809a.tar
guix-bb4e67415eb6d9871ee1b50b0a01e08c19f4809a.tar.gz
installer: Fix crash in parameters menu.
Fixes: <https://issues.guix.gnu.org/45378>. * gnu/installer/newt/keymap.scm (run-layout-page): Return false when "Continue" button is pressed. (run-keymap-page): Do not try to compute variants if layout is false. Also do not try to format the result if layout is false. * gnu/installer.scm (compute-keymap-step): Do not apply keymap if "run-keymap-page" returns false.
Diffstat (limited to 'gnu/installer.scm')
-rw-r--r--gnu/installer.scm2
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/installer.scm b/gnu/installer.scm
index 7863edbb67..d2be4b34f9 100644
--- a/gnu/installer.scm
+++ b/gnu/installer.scm
@@ -187,7 +187,7 @@ selected keymap."
(lambda (models layouts)
((installer-keymap-page current-installer)
layouts '#$context)))))
- (#$apply-keymap result)
+ (and result (#$apply-keymap result))
result)))
(define (installer-steps)