[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: installer: If there's a timeout, don't call the key handlers.
From: |
Danny Milosavljevic |
Subject: |
01/01: installer: If there's a timeout, don't call the key handlers. |
Date: |
Wed, 5 Jul 2017 05:13:58 -0400 (EDT) |
dannym pushed a commit to branch wip-installer-2
in repository guix.
commit a74debeb6a0371c748df6a8385e863da4ccaf886
Author: Danny Milosavljevic <address@hidden>
Date: Wed Jul 5 11:13:30 2017 +0200
installer: If there's a timeout, don't call the key handlers.
* gnu/system/installer/guixsd-installer.scm (guixsd-installer): Modify.
---
gnu/system/installer/guixsd-installer.scm | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/gnu/system/installer/guixsd-installer.scm
b/gnu/system/installer/guixsd-installer.scm
index 85a9975..8c12f49 100644
--- a/gnu/system/installer/guixsd-installer.scm
+++ b/gnu/system/installer/guixsd-installer.scm
@@ -325,12 +325,13 @@
; (#f ...))
((page-mouse-handler current-page) current-page device-id x y
z button-state))
(_ #f))
- (let* ((current-page (page-top))
- (ret ((page-key-handler current-page) current-page
ch)))
- (when (eq? ret 'cancelled)
- (page-ppop))
- (base-page-key-handler current-page ch)))
- (if ch ; not #f
+ (if ch ; not timeout
+ (let* ((current-page (page-top))
+ (ret ((page-key-handler current-page) current-page
ch)))
+ (when (eq? ret 'cancelled)
+ (page-ppop))
+ (base-page-key-handler current-page ch))))
+ (if ch ; not timeout
(let ((current-page (page-top))) ; Not necessarily the same.
((page-refresh current-page) current-page))))
(loop (getch stdscr)))