[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: installer: Handle 'cancelled return from mouse event handler, too
|
From: |
Danny Milosavljevic |
|
Subject: |
01/01: installer: Handle 'cancelled return from mouse event handler, too. |
|
Date: |
Wed, 5 Jul 2017 06:47:07 -0400 (EDT) |
dannym pushed a commit to branch wip-installer-2
in repository guix.
commit b77519be76f52be93dd2ad10763c551120ade96a
Author: Danny Milosavljevic <address@hidden>
Date: Wed Jul 5 12:46:36 2017 +0200
installer: Handle 'cancelled return from mouse event handler, too.
* gnu/system/installer/guixsd-installer.scm (guixsd-installer): Modify.
---
gnu/system/installer/guixsd-installer.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/system/installer/guixsd-installer.scm
b/gnu/system/installer/guixsd-installer.scm
index 8c12f49..17c27ac 100644
--- a/gnu/system/installer/guixsd-installer.scm
+++ b/gnu/system/installer/guixsd-installer.scm
@@ -323,7 +323,12 @@
;(match (mouse-trafo win y x #t)
; ((y x) ...)
; (#f ...))
- ((page-mouse-handler current-page) current-page device-id x y
z button-state))
+ (let ((ret ((page-mouse-handler current-page) current-page
+ device-id
+ x y z
+ button-state)))
+ (when (eq? ret 'cancelled)
+ (page-ppop))))
(_ #f))
(if ch ; not timeout
(let* ((current-page (page-top))